Migrate to Swift 5

frederoni · frederoni · commit 1b836b0612a1 · 2019-04-01T22:25:28.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,19 +17,10 @@ step-library:
       run:
         name: Prepare
         command: |
-          git submodule sync
-          if (brew outdated | grep carthage > /dev/null); then brew upgrade carthage; fi
+          brew unlink carthage
+          brew install --HEAD carthage
           echo "foo" > ~/.mapbox
 
-  - &install-dependencies
-      run:
-        name: Install Dependencies
-        command: |
-          carthage bootstrap --platform ios --cache-builds --no-use-binaries
-          carthage bootstrap --platform tvos --cache-builds --no-use-binaries
-          carthage bootstrap --platform macos --cache-builds --no-use-binaries
-          carthage bootstrap --platform watchos --cache-builds --no-use-binaries
-
   - &publish-codecov
       run:
         name: Publish Code Coverage data
@@ -40,7 +31,6 @@ jobs:
     parameters:
       xcode:
         type: string
-        default: "10.1.0"
       device:
         type: string
         default: "iPhone 6 Plus"
@@ -74,15 +64,31 @@ jobs:
           condition: << parameters.install_legacy_sim >>
           steps:
             - run: xcversion simulators --install="iOS << parameters.iOS >>"
-      - *install-dependencies
       - run:
-          name: Build and Test SDK
+          name: iOS
           command: |
-            xcodebuild -sdk iphonesimulator -project MapboxDirections.xcodeproj -scheme 'MapboxDirections iOS' -destination 'platform=iOS Simulator,<< parameters.iOS >>,name=<< parameters.device >>' clean build <<# parameters.test >>test <</ parameters.test >> <<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
-            xcodebuild -sdk iphonesimulator -project MapboxDirections.xcodeproj -scheme 'MapboxDirections watchOS' -destination 'watchOS Simulator,name=Apple Watch Series 3 - 42mm,OS=<< parameters.iOS >>' clean build <<# parameters.test >>test <</ parameters.test >> <<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
-            xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections Mac' clean build clean build <<# parameters.test >>test <</ parameters.test >> <<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
+            carthage bootstrap --platform ios --cache-builds --no-use-binaries --new-resolver
+            xcodebuild -sdk iphonesimulator -project MapboxDirections.xcodeproj -scheme 'MapboxDirections iOS' -destination 'platform=iOS Simulator,OS=<< parameters.iOS >>,name=<< parameters.device >>' clean build <<# parameters.test >>test <</ parameters.test >> <<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>  
+      - run:
+          name: tvOS
+          command: |
+            carthage bootstrap --platform tvos --cache-builds --no-use-binaries --new-resolver
             xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections tvOS' -destination 'platform=tvOS Simulator,name=Apple TV 4K (at 1080p),OS=<< parameters.tvOS >>' clean build <<# parameters.test >>test <</ parameters.test >> <<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
-      - *save-cache            
+      - run:
+          name: macOS
+          command: |
+            carthage bootstrap --platform macos --cache-builds --no-use-binaries --new-resolver
+            xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections Mac' clean build<<# parameters.test >> test <</ parameters.test >><<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
+      - run:
+          name: watchOS
+          command: |
+            carthage bootstrap --platform watchos --cache-builds --no-use-binaries --new-resolver
+            xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 3 - 42mm,OS=<< parameters.watchOS >>' clean build
+      - when:
+          condition: << parameters.codecoverage >>
+          steps:
+            - run: bash <(curl -s https://codecov.io/bash)
+      - *save-cache           
 
 workflows:
   workflow:
@@ -91,12 +97,15 @@ workflows:
           name: "Xcode 10.2 iOS 12.2"
           xcode: "10.2.0"
           iOS: "12.2"
+          tvOS: "12.2"
+          watchOS: "5.2"
       - build-job:
           name: "Xcode 10.1 iOS 12.1"
           xcode: "10.1.0"
           iOS: "12.1"
+          tvOS: "12.1"
       - build-job:
-          name: "Xcode 9.4 iOS 11.2"
+          name: "Xcode 9.4 iOS 9.3"
           xcode: "9.4.1"
-          iOS: "11.4"
-          watchOS: "4.2"
+          iOS: "9.3"
+          install_legacy_sim: true
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,2 +1,2 @@
 binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 4.4
-github "AliSoftware/OHHTTPStubs" ~> 7.0
+github "linksmt/OHHTTPStubs" "563f48d3fab84ef04639649c770b00f4fa502cca"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
 binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "4.9.0"
-github "AliSoftware/OHHTTPStubs" "7.0.0"
+github "linksmt/OHHTTPStubs" "563f48d3fab84ef04639649c770b00f4fa502cca"
 github "raphaelmor/Polyline" "v4.2.0"
diff --git a/MapboxDirections.xcodeproj/project.pbxproj b/MapboxDirections.xcodeproj/project.pbxproj
@@ -1010,7 +1010,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = Mapbox;
 				TargetAttributes = {
 					DA1A10AE1D00F8FF009F82FA = {
@@ -1035,11 +1035,11 @@
 					};
 					DA6C9D871CAE442B00094FBC = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0910;
+						LastSwiftMigration = 1020;
 					};
 					DA6C9D901CAE442B00094FBC = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0910;
+						LastSwiftMigration = 1020;
 					};
 					DADD27B41E5AAAD800D31FAD = {
 						CreatedOnToolsVersion = 8.2.1;
@@ -1053,7 +1053,7 @@
 			};
 			buildConfigurationList = DD6254491AE70C1700017857 /* Build configuration list for PBXProject "MapboxDirections" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -1774,8 +1774,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxDirections;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1802,8 +1801,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxDirections;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -1823,8 +1821,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(PROJECT_DIR)/Carthage/Build/iOS @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxDirectionsTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1841,8 +1838,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(PROJECT_DIR)/Carthage/Build/iOS @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxDirectionsTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/MapboxDirections.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme b/MapboxDirections.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MapboxDirections.xcodeproj/xcshareddata/xcschemes/Example (Swift).xcscheme b/MapboxDirections.xcodeproj/xcshareddata/xcschemes/Example (Swift).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections Mac.xcscheme b/MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections iOS.xcscheme b/MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections tvOS.xcscheme b/MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections watchOS.xcscheme b/MapboxDirections.xcodeproj/xcshareddata/xcschemes/MapboxDirections watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/MapboxDirections/Match/MBMatchOptions.swift b/MapboxDirections/Match/MBMatchOptions.swift
@@ -53,7 +53,7 @@ open class MatchOptions: DirectionsOptions {
 
      If specified, each index must correspond to a valid index in `coordinates`, and the index set must contain 0 and the last index (one less than `endIndex`) of `coordinates`.
      */
-    @available(*, deprecated: 0.1, message: "Use Waypoint.separatesLegs instead.")
+    @available(*, deprecated, message: "Use Waypoint.separatesLegs instead.")
     @objc open var waypointIndices: IndexSet?
     
     override var legSeparators: [Waypoint] {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 4.4`
`2`		`-github "AliSoftware/OHHTTPStubs" ~> 7.0`
	`2`	`+github "linksmt/OHHTTPStubs" "563f48d3fab84ef04639649c770b00f4fa502cca"`