fwtoolkit 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a46b5ac8023ae30066294682e52117dd7ee58126
-  data.tar.gz: a21fe22b6f219ade43107bc15707dfa68cd7e1da
+  metadata.gz: 01e601f695a710bf7c308dd7349195dbfe3a0d3b
+  data.tar.gz: 2ccdaab2de836ca39d6e50511c8de05c9150070e
 SHA512:
-  metadata.gz: 94bda7eb9082fc1d01ea28e1b062f1df325a61f16a1ee2e8e9db7d801bcac6c74d58cf870e1bdae717099d1f6bb9ec0e543b3a24beb52e658ae6f21b8b3bd547
-  data.tar.gz: dd69e51e4d6b5be91dc07ef611f301edf39eecb27ffddb09e64eda745cc45124a71ab8a7860b546fee20fe19564dbfff1b98279668473260d859c8ddebffdc5c
+  metadata.gz: 6a1e6ea251607c00eea0c620745acd5f8b2a2434f769cd30eb6f9186a45a059f5ac7b73174cf572a53103230c164cb7bc923a7f9defcfac89cc197769f197dff
+  data.tar.gz: 0aa363fde90f30d2b3ef806ab854b8ac3d0149127700c73f60c680cd72b095a0e23763c97f0bc12f0aea202a1f256e64180dcf397436d0e2a759efe87e9a5f90

data/lib/fwtoolkit/cli.rb

@@ -4,24 +4,13 @@ require 'fwtoolkit/config'
 require 'fwtoolkit/cli/ext/thor'
 require 'fwtoolkit/cli/fw_actions'
 
-require 'fwtoolkit/cli/cocoapods'
 require 'fwtoolkit/cli/xcode'
 require 'fwtoolkit/cli/project'
-require 'fwtoolkit/cli/bootstrap'
 require 'fwtoolkit/cli/git'
-#require 'fwtoolkit/cli/ota'
 
 module FWToolkit
   class CLI < Thor
-
- #   register FWToolkit::Cocoapods, 'pods', 'pods SUBCOMMAND ...ARGS', 'Manage cocoapods'
     register FWToolkit::Project, 'proj', 'proj SUBCOMMAND ...ARG', 'Create projects and manage settings'
- #   register FWToolkit::Xcode, 'xcode', 'xcode SUBCOMMAND ...ARGS', 'Manage Xcode build process'
- #   register FWToolkit::Bootstrap, 'bootstrap', 'bootstrap', 'Install and configure system tools'
-#    register FWToolkit::Ci, 'ci', 'ci SUBCOMMAND ...ARGS', 'Manage the configuration of projects on the CI'
-
- #   register FWToolkit::Git, 'git', 'git SUBCOMMAND ...ARGS', 'Manage git flow'
-    #register FWToolkit::Ota, 'fwbuild', 'fwbuild SUBCOMMAND ...ARGS', 'Manage publishing build to the OTA server'
   end
 end
 

data/lib/fwtoolkit/cli/project.rb

@@ -13,9 +13,9 @@ module FWToolkit
     include FWToolkit::ThorUtils
     source_root_templates!
 
-    desc "new [PROJECT_LANGUAGE] [PROJECT NAME] [CLASS PREFIX]", "Create a new Xcode project with FW's settings. Language is either objc or swiftgho"
+    desc "new [swift|objc] [PROJECT NAME] [CLASS PREFIX]", "Create a new Xcode project with FW's settings. Language is either objc or swift"
     def new(project_language, project_name, class_prefix)
-      destination_root = File.join(Dir.pwd, project_name)
+      destination_root = File.join(Dir.pwd, '..', project_name)
 
       say "Creating new project in: #{File.expand_path destination_root}"
 
@@ -45,6 +45,7 @@ module FWToolkit
       directory "templates/default_project/rvm", destination_root
 
       inside(destination_root) do
+        run! "rvm install ruby-#{Config.ruby_version}"
         run! "rvm #{Config.ruby_version} do rvm --ruby-version --create ruby-#{Config.ruby_version}@#{@project_name}", {:capture => true}
         bundle_update
       end

data/lib/fwtoolkit/version.rb

@@ -1,3 +1,3 @@
 module FWToolkit
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/templates/objc_project/xcode/%project_name%/%project_name%.xcodeproj/project.pbxproj.tt

@@ -174,7 +174,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = "<%= config[:class_prefix] %>";
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Future Workshops";
 				TargetAttributes = {
 					B750287F1C5A3F7A000EB3CF = {
@@ -290,8 +290,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -335,8 +337,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";

data/templates/objc_project/xcode/%project_name%/%project_name%.xcodeproj/xcshareddata/xcschemes/%project_name%.xcscheme.tt

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

data/templates/objc_project/xcode/%project_name%/%target_name%/%class_prefix%AppDelegate.h.tt

@@ -2,8 +2,7 @@
 //  AppDelegate.h
 //  <%= config[:project_name] %>
 //
-//  Created by <%= config[:project_creator] %> on 02/01/2015.
-//  Copyright (c) 2015 <%= config[:organization_name] %>. All rights reserved.
+//  Copyright (c) <%= config[:organization_name] %>. All rights reserved.
 //
 
 @import UIKit;

data/templates/objc_project/xcode/%project_name%/%target_name%/%class_prefix%AppDelegate.m.tt

@@ -2,8 +2,7 @@
 //  AppDelegate.m
 //  <%= config[:project_name] %>
 //
-//  Created by <%= config[:project_creator] %> on 02/01/2015.
-//  Copyright (c) 2015 <%= config[:organization_name] %>. All rights reserved.
+//  Copyright (c) <%= config[:organization_name] %>. All rights reserved.
 //
 
 #import "<%= config[:class_prefix] %>AppDelegate.h"

data/templates/objc_project/xcode/%project_name%/%target_name%/%class_prefix%ViewController.h.tt

@@ -2,8 +2,7 @@
 //  ViewController.h
 //  <%= config[:project_name] %>
 //
-//  Created by <%= config[:project_creator] %> on 02/01/2015.
-//  Copyright (c) 2015 <%= config[:organization_name] %>. All rights reserved.
+//  Copyright (c) <%= config[:organization_name] %>. All rights reserved.
 //
 
 @import UIKit;

data/templates/objc_project/xcode/%project_name%/%target_name%/%class_prefix%ViewController.m.tt

@@ -2,8 +2,7 @@
 //  ViewController.m
 //  <%= config[:project_name] %>
 //
-//  Created by <%= config[:project_creator] %> on 02/01/2015.
-//  Copyright (c) 2015 <%= config[:organization_name] %>. All rights reserved.
+//  Copyright (c) <%= config[:organization_name] %>. All rights reserved.
 //
 
 #import "<%= config[:class_prefix] %>ViewController.h"

data/templates/objc_project/xcode/%project_name%/%target_name%/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,63 +1,147 @@
 {
   "images" : [
     {
+      "size" : "20x20",
       "idiom" : "iphone",
-      "size" : "29x29",
+      "filename" : "Icon-App-20x20@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "20x20",
       "idiom" : "iphone",
-      "size" : "29x29",
+      "filename" : "Icon-App-20x20@3x.png",
       "scale" : "3x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "size" : "40x40",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-29x29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
       "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-40x40@3x.png",
       "scale" : "3x"
     },
     {
+      "size" : "57x57",
       "idiom" : "iphone",
-      "size" : "60x60",
+      "filename" : "Icon-App-57x57@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-57x57@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "60x60",
       "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Icon-App-60x60@3x.png",
       "scale" : "3x"
     },
     {
+      "size" : "20x20",
       "idiom" : "ipad",
-      "size" : "29x29",
+      "filename" : "Icon-App-20x20@1x.png",
       "scale" : "1x"
     },
     {
+      "size" : "20x20",
       "idiom" : "ipad",
+      "filename" : "Icon-App-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
       "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-29x29@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "40x40",
       "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@1x.png",
+      "scale" : "1x"
+    },
+    {
       "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "50x50",
+      "idiom" : "ipad",
+      "filename" : "Icon-Small-50x50@1x.png",
       "scale" : "1x"
     },
     {
+      "size" : "50x50",
       "idiom" : "ipad",
-      "size" : "40x40",
+      "filename" : "Icon-Small-50x50@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "72x72",
       "idiom" : "ipad",
-      "size" : "76x76",
+      "filename" : "Icon-App-72x72@1x.png",
       "scale" : "1x"
     },
     {
+      "size" : "72x72",
       "idiom" : "ipad",
+      "filename" : "Icon-App-72x72@2x.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-76x76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
     }
   ],

data/templates/objc_project/xcode/%project_name%/%target_name%/Supporting Files/main.m.tt

@@ -2,8 +2,7 @@
 //  main.m
 //  <%= config[:project_name] %>
 //
-//  Created by Fabio Gallonetto on 28/01/2016.
-//  Copyright © 2016 Future Workshops. All rights reserved.
+//  Copyright © <%= config[:organization_name] %>. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

data/templates/objc_project/xcode/%project_name%/%target_name%Tests/%class_prefix%%project_name%Tests.m.tt

@@ -1,9 +1,7 @@
 //
 //  <%= config[:class_prefix] %><%= config[:project_name] %>Tests.m
-//  <%= config[:class_prefix] %><%= config[:project_name] %>Tests
 //
-//  Created by Fabio Gallonetto on 28/01/2016.
-//  Copyright © 2016 Future Workshops. All rights reserved.
+//  Copyright © <%= config[:organization_name] %>. All rights reserved.
 //
 
 #import <XCTest/XCTest.h>

data/templates/swift_project/xcode/%project_name%/%project_name%.xcodeproj/project.pbxproj.tt

@@ -167,14 +167,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Future Workshops";
 				TargetAttributes = {
 					B75028B01C5A3F94000EB3CF = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0820;
 					};
 					B75028C41C5A3F94000EB3CF = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0820;
 						TestTargetID = B75028B01C5A3F94000EB3CF;
 					};
 				};
@@ -282,8 +284,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -328,8 +332,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -348,6 +354,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -361,6 +368,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.futureworkshops.<%= config[:project_name] %>";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -372,6 +380,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.futureworkshops.<%= config[:project_name] %>";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -383,6 +392,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.futureworkshops.<%= config[:project_name] %>Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/<%= config[:project_name] %>.app/<%= config[:project_name] %>";
 			};
 			name = Debug;
@@ -395,6 +405,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.futureworkshops.<%= config[:project_name] %>Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/<%= config[:project_name] %>.app/<%= config[:project_name] %>";
 			};
 			name = Release;