Merge pull request #129 from layoutBox/upgrade_swift_4.2

Upgrade to Swift 4.2

Author: lucdion

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.3
+osx_image: xcode10.2
 
 addons:
   homebrew:
@@ -14,13 +14,10 @@ before_install:
   # - rvm use $RVM_RUBY_VERSION
   - bundle install
   - gem install xcpretty-travis-formatter;
-  #- gem install cocoapods -v '1.3.1' --no-document --quiet;
-  # - gem install slather --no-document --quiet;  
   - bundle exec pod install --repo-update;
-  # - carthage bootstrap --verbose --platform iOS --cache-builds --use-ssh 
 
 script:
-  - buck test :yoga
+  # - buck test :yoga
   - set -o pipefail && bundle exec fastlane travis
 
 after_success:

Brewfile

@@ -1,2 +1,2 @@
 tap 'facebook/fb'
-brew 'buck'
+brew 'buck'

Example/FlexLayoutSample.xcodeproj/project.pbxproj

@@ -373,7 +373,7 @@
 				ORGANIZATIONNAME = Mirego;
 				TargetAttributes = {
 					DF1F2A051F17D11700BA1B97 = {
-						LastSwiftMigration = 0930;
+						LastSwiftMigration = 1010;
 					};
 				};
 			};
@@ -436,13 +436,11 @@
 				"${SRCROOT}/../Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
-				"${PODS_ROOT}/Reveal-SDK/RevealServer-10/iOS/RevealServer.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinLayout.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -643,8 +641,7 @@
 				INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -657,8 +654,7 @@
 				INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

Example/FlexLayoutSample/AppDelegate.swift

@@ -18,7 +18,7 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 
         window = UIWindow(frame: UIScreen.main.bounds)
         window!.backgroundColor = UIColor.white

Example/FlexLayoutSample/UI/Examples/RaywenderlichTutorial/RaywenderlichTutorialView.swift

@@ -207,7 +207,7 @@ class RayWenderlichTutorialView: UIView {
         let tabLabelFont = selected ? UIFont.boldSystemFont(ofSize: 14.0) : UIFont.systemFont(ofSize: 14.0)
 
         #if swift(>=4)
-        let labelSize = text.size(withAttributes: [NSAttributedStringKey.font: tabLabelFont])
+        let labelSize = text.size(withAttributes: [NSAttributedString.Key.font: tabLabelFont])
         #else
         let labelSize = text.size(withAttributes: [NSAttributedStringKey.font: tabLabelFont])
         #endif

Example/FlexLayoutSample/UI/Examples/RaywenderlichTutorial/Subviews/ShowTableViewCell.swift

@@ -16,7 +16,7 @@ import UIKit
 class ShowTableViewCell: UITableViewCell {
     static var reuseIdentifier = "ShowTableViewCell"
 
-    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: .subtitle, reuseIdentifier: reuseIdentifier)
 
         self.textLabel?.textColor = .white

Example/FlexLayoutSample/UI/Examples/TableViewExample/Subviews/MethodCell.swift

@@ -23,7 +23,7 @@ class MethodCell: UITableViewCell {
     fileprivate let nameLabel = UILabel()
     fileprivate let descriptionLabel = UILabel()
 
-    override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
         selectionStyle = .none

Example/FlexLayoutSample/UI/Examples/TableViewExample/TableViewExampleView.swift

@@ -74,6 +74,6 @@ extension TableViewExampleView: UITableViewDataSource, UITableViewDelegate {
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         // The UITableView will call the cell's sizeThatFit() method to compute the height.
         // WANRING: You must also set the UITableView.estimatedRowHeight for this to work.
-        return UITableViewAutomaticDimension
+        return UITableView.automaticDimension
     }
 }

FlexLayout.xcodeproj/project.pbxproj

@@ -330,13 +330,13 @@
 				TargetAttributes = {
 					24DA37591EF843C500D1AB2F = {
 						CreatedOnToolsVersion = 8.3.2;
-						LastSwiftMigration = 0930;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Manual;
 					};
 					24DA37621EF843C500D1AB2F = {
 						CreatedOnToolsVersion = 8.3.2;
 						DevelopmentTeam = F37Y9H9E46;
-						LastSwiftMigration = 0930;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -611,8 +611,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -640,8 +639,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -655,8 +653,7 @@
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -670,8 +667,7 @@
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

FlexLayoutTests/RectNimbleMatcher.swift

@@ -24,19 +24,19 @@ public func beCloseTo(_ expectedValue: CGRect, within delta: CGFloat = 0.000_01)
     let errorMessage = "be close to <\(stringify(expectedValue))> (each within \(stringify(delta)))"
     return Predicate.simple(errorMessage) { actualExpression in
         if let actual = try actualExpression.evaluate() {
-            if fabs(actual.origin.x - expectedValue.origin.x) > delta {
+            if abs(actual.origin.x - expectedValue.origin.x) > delta {
                 return .doesNotMatch
             }
 
-            if fabs(actual.origin.y - expectedValue.origin.y) > delta {
+            if abs(actual.origin.y - expectedValue.origin.y) > delta {
                 return .doesNotMatch
             }
 
-            if fabs(actual.size.width - expectedValue.size.width) > delta {
+            if abs(actual.size.width - expectedValue.size.width) > delta {
                 return .doesNotMatch
             }
 
-            if fabs(actual.size.height - expectedValue.size.height) > delta {
+            if abs(actual.size.height - expectedValue.size.height) > delta {
                 return .doesNotMatch
             }
 

Podfile

@@ -18,7 +18,6 @@ target 'FlexLayoutSample' do
   pod 'PinLayout'
 
   # Debug only
-  pod 'Reveal-SDK', '~> 10', :configurations => ['Debug']
   pod 'SwiftLint'
 end
 

Podfile.lock

@@ -3,23 +3,20 @@ PODS:
   - Nimble (8.0.1)
   - PinLayout (1.8.7)
   - Quick (2.1.0)
-  - Reveal-SDK (10)
-  - SwiftLint (0.32.0)
+  - SwiftLint (0.33.0)
 
 DEPENDENCIES:
   - FlexLayout (from `./`)
   - Nimble
   - PinLayout
   - Quick
-  - Reveal-SDK (~> 10)
   - SwiftLint
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - Nimble
     - PinLayout
     - Quick
-    - Reveal-SDK
     - SwiftLint
 
 EXTERNAL SOURCES:
@@ -31,9 +28,8 @@ SPEC CHECKSUMS:
   Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
   PinLayout: a0722a5c8f0e0168a9c091ffe4930dabf0c8582c
   Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
-  Reveal-SDK: 7869ddf1f902cabbb07a1f0dd06bd25861a126f7
-  SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d
+  SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e
 
-PODFILE CHECKSUM: b49d5685f476a6600d008e69e030f9d4045be518
+PODFILE CHECKSUM: 9c74b444ce1d9b0b90a0d90a353efb1f26fd93e2
 
 COCOAPODS: 1.5.3

fastlane/Fastfile

@@ -46,7 +46,8 @@ platform :ios do
       scheme: "FlexLayout",
       configuration: "Release",
       build: true,
-      clean: true
+      clean: true,
+      destination: "platform=iOS Simulator,name=iPhone X,OS=12.2"
     )
 
     #xcodebuild(
@@ -55,6 +56,7 @@ platform :ios do
     #  configuration: "Release",
     #  build: true,
     #  clean: true
+    #  destination: "platform=iOS Simulator,name=iPhone X,OS=12.2"
     #)
 
     xcodebuild(
@@ -63,7 +65,7 @@ platform :ios do
       configuration: "Release",
       build: true,
       clean: true,
-      destination: "generic/platform=iOS\" CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=\""
+      destination: "platform=iOS Simulator,name=iPhone X,OS=12.2"
     )
   end
 
@@ -80,7 +82,7 @@ platform :ios do
   lane :travis do
     build
     tests
-    pod_lib_lint(allow_warnings: true, verbose: false)
+    #pod_lib_lint(allow_warnings: true, verbose: false)
   end
 
   lane :deploy do