Merge pull request #18 from layoutBox/update_swift_4.2

Update to Swift 4.2

Author: lucdion

.travis.yml

@@ -1,10 +1,10 @@
 language: objective-c
-osx_image: xcode9.4 
+osx_image: xcode10
 
 before_install:
   - gem install xcpretty-travis-formatter;
   - gem install cocoapods --no-document --quiet;
   - pod install --repo-update;
 
 script:
-  - set -o pipefail && xcodebuild -workspace LayoutFrameworkBenchmark.xcworkspace -scheme LayoutFrameworkBenchmark -sdk iphonesimulator11.4 -destination 'platform=iOS Simulator,name=iPhone 8' build | xcpretty -f `xcpretty-travis-formatter`
+  - set -o pipefail && xcodebuild -workspace LayoutFrameworkBenchmark.xcworkspace -scheme LayoutFrameworkBenchmark -sdk iphonesimulator12.0 -destination 'platform=iOS Simulator,name=iPhone 8' build | xcpretty -f `xcpretty-travis-formatter`

LayoutFrameworkBenchmark.xcodeproj/project.pbxproj

@@ -241,8 +241,8 @@
 				TargetAttributes = {
 					24661CFB1F4EFFF5002CB883 = {
 						CreatedOnToolsVersion = 8.3.2;
-						DevelopmentTeam = 4Q596JWQC5;
-						LastSwiftMigration = 0920;
+						DevelopmentTeam = ZYH5WDPX24;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -290,7 +290,7 @@
 				"${BUILT_PRODUCTS_DIR}/NKFrameLayoutKit/NKFrameLayoutKit.framework",
 				"${BUILT_PRODUCTS_DIR}/NotAutoLayout/NotAutoLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
-				"${PODS_ROOT}/Reveal-SDK/RevealServer-16/iOS/RevealServer.framework",
+				"${PODS_ROOT}/Reveal-SDK/RevealServer-19/iOS/RevealServer.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -481,14 +481,13 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = 4Q596JWQC5;
+				DEVELOPMENT_TEAM = ZYH5WDPX24;
 				INFOPLIST_FILE = LayoutFrameworkBenchmark/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.LayoutFrameworkBenchmark;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -498,14 +497,13 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = 4Q596JWQC5;
+				DEVELOPMENT_TEAM = ZYH5WDPX24;
 				INFOPLIST_FILE = LayoutFrameworkBenchmark/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.LayoutFrameworkBenchmark;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

LayoutFrameworkBenchmark.xcodeproj/xcshareddata/xcschemes/LayoutFrameworkBenchmark.xcscheme

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

LayoutFrameworkBenchmark.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

LayoutFrameworkBenchmark.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = UINavigationController(rootViewController: BenchmarkViewController())
         window?.makeKeyAndVisible()

LayoutFrameworkBenchmark/AppDelegate.swift

@@ -29,7 +29,7 @@ class BenchmarkViewController: UITableViewController {
             return CollectionViewControllerFeedItemFlexLayoutView(data: data)
         }),
 
-        ViewControllerData(title: "LayoutKit 7.0", factoryBlock: { viewCount in
+        ViewControllerData(title: "LayoutKit 10.0", factoryBlock: { viewCount in
             let data = FeedItemData.generate(count: viewCount)
             return CollectionViewControllerFeedItemLayoutKitView(data: data)
         }),
@@ -39,17 +39,17 @@ class BenchmarkViewController: UITableViewController {
             return CollectionViewControllerFeedItemManualView(data: data)
         }),
 
-		ViewControllerData(title: "NKFrameLayoutKit", factoryBlock: { viewCount in
+		ViewControllerData(title: "NKFrameLayoutKit 2.4", factoryBlock: { viewCount in
 			let data = FeedItemData.generate(count: viewCount)
 			return CollectionViewControllerFeedItemNKFrameLayoutKitView(data: data)
 		}),
 
-        ViewControllerData(title: "NotAutoLayout", factoryBlock: { viewCount in
+        ViewControllerData(title: "NotAutoLayout 3.2", factoryBlock: { viewCount in
             let data = FeedItemData.generate(count: viewCount)
             return CollectionViewControllerFeedItemNotAutoLayoutView(data: data)
         }),
 
-        ViewControllerData(title: "PinLayout 1.7", factoryBlock: { viewCount in
+        ViewControllerData(title: "PinLayout 1.8", factoryBlock: { viewCount in
             let data = FeedItemData.generate(count: viewCount)
             return CollectionViewControllerFeedItemPinLayoutView(data: data)
         }),

LayoutFrameworkBenchmark/Benchmarks/BenchmarkViewController.swift

@@ -17,3 +17,14 @@ target 'LayoutFrameworkBenchmark' do
 
     pod 'Reveal-SDK'
 end
+
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+      if ['LayoutKit'].include? target.name
+          target.build_configurations.each do |config|
+              config.build_settings['SWIFT_VERSION'] = '4.1'
+          end
+      end
+  end
+end

Podfile

@@ -1,10 +1,10 @@
 PODS:
-  - FlexLayout (1.3.9)
-  - LayoutKit (8.0.1)
-  - NKFrameLayoutKit (2.1)
-  - NotAutoLayout (3.1.1)
-  - PinLayout (1.7.9)
-  - Reveal-SDK (16)
+  - FlexLayout (1.3.11)
+  - LayoutKit (10.0.1)
+  - NKFrameLayoutKit (2.4)
+  - NotAutoLayout (3.2.0)
+  - PinLayout (1.8.6)
+  - Reveal-SDK (19)
 
 DEPENDENCIES:
   - FlexLayout
@@ -24,13 +24,13 @@ SPEC REPOS:
     - Reveal-SDK
 
 SPEC CHECKSUMS:
-  FlexLayout: dbe4b2da72ee63d7145cf32bb5bfba375aeeb9e6
-  LayoutKit: dab1c2eea7a0bf9d8d755a8a793f87a929768455
-  NKFrameLayoutKit: 6a2f6ac34f85d495e683ea0f7f1605903a4d3e00
-  NotAutoLayout: 2e6e82146dcb556cb61fcfd638b202639c167e84
-  PinLayout: 21ce87a865407a7a3c8a38a326611c476095fedf
-  Reveal-SDK: ed36bdbb3cbf90b94ae5da0dbcb3c7ae6738c51f
+  FlexLayout: b008184d23aae0c56e1c916e803445a13a6f4e5a
+  LayoutKit: 4e69fb0f1cc3e9c2a764b58f99e88004f5da861c
+  NKFrameLayoutKit: c119f04a6ac305c7db5e29e1b856cee0e8a661bb
+  NotAutoLayout: 4723ad82a21a7c6c60c823fff7f7c29467811b92
+  PinLayout: fe2a2432d6982588e208572005c941aeeae417ab
+  Reveal-SDK: 9f0d2c6c12eb7507921e5454ac165b7aa21140a4
 
-PODFILE CHECKSUM: 7f58ddd1b9687b031aeb33d986faeaf19ed0e225
+PODFILE CHECKSUM: 3e63d42365b39b217c5809f0c7ebad9865d228e2
 
 COCOAPODS: 1.5.3