Update Xcode versions (#717)

* Bump Xcode versions * Fix dependency cycle in Xcode project * fix Apple TV simulator * Fix dependency cycle for all platforms
mapbox · Jul 21, 2022 · fe7fe98 · fe7fe98
1 parent 0507988
commit fe7fe98
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 27 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -80,11 +80,10 @@ jobs:
             fi
   spm-linux-job:
     docker:
-      - image: swift:5.4
+      - image: swift:5.6
     steps:
       - checkout
-      # Limiting number of parallel jobs to avoid build crash bug.
-      - run: swift build --jobs=1
+      - run: swift build
       - run: swift test
 
   spm-job:
@@ -120,7 +119,7 @@ jobs:
             carthage bootstrap --platform all --use-netrc --use-xcframeworks
   example-app-build:
     macos:
-      xcode: "12.4.0"
+      xcode: "13.4.1"
     environment:
       HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
@@ -131,25 +130,26 @@ jobs:
       - carthage-bootstrap
       - run:
           name: "Build example app"
-          command: xcodebuild -sdk iphonesimulator -project MapboxDirections.xcodeproj -scheme 'Example' -destination 'platform=iOS Simulator,OS=14.4,name=iPhone 12 Pro Max' clean build
+          command: xcodebuild -sdk iphonesimulator -project MapboxDirections.xcodeproj -scheme 'Example' -destination 'platform=iOS Simulator,OS=15.5,name=iPhone 13 Pro Max' clean build
       - save-cache
 
   build-job:
     parameters:
       xcode:
         type: string
+        default: "13.4.1"
       device:
         type: string
-        default: "iPhone 8 Plus"
+        default: "iPhone 13"
       iOS:
         type: string
-        default: "12.1"
+        default: "15.5"
       watchOS:
         type: string
-        default: "5.0"
+        default: "8.5"
       tvOS:
         type: string
-        default: "12.0"
+        default: "15.4"
       test:
         type: boolean
         default: true
@@ -179,7 +179,7 @@ jobs:
             - publish-codecov
       - run:
           name: tvOS
-          command: 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 >>
+          command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections tvOS' -destination 'platform=tvOS Simulator,name=Apple TV,OS=<< parameters.tvOS >>' clean build <<# parameters.test >>test <</ parameters.test >> <<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
       - when:
           condition: << parameters.codecoverage >>
           steps:
@@ -198,23 +198,19 @@ workflows:
       - detect-breaking-changes:
           name: "Detect Breaking Changes"
       - build-job:
-          name: "Dev Build: Xcode 12.0"
-          xcode: "12.0.0"
-          iOS: "14.0"
-          tvOS: "14.0"
-          watchOS: "7.0"
+          name: "Dev Build: Xcode 13.4.1"
       - carthage-integration-test:
-          name: "Carthage Integration Test 12.0"
-          xcode: "12.0.0"
+          name: "Carthage Integration Test 12.5.1"
+          xcode: "12.5.1"
       - carthage-integration-test:
-          name: "Carthage Integration Test 12.4"
-          xcode: "12.4.0"
+          name: "Carthage Integration Test 13.4.1"
+          xcode: "13.4.1"
       - spm-job:
-          name: "SPM build 12.0.0"
-          xcode: "12.0.0"
+          name: "SPM build 12.5.1"
+          xcode: "12.5.1"
       - spm-job:
-          name: "SPM build 12.4.0"
-          xcode: "12.4.0"
+          name: "SPM build 13.4.1"
+          xcode: "13.4.1"
       - spm-linux-job:
           name: "SPM Ubuntu build"
       - example-app-build:

diff --git a/MapboxDirections.xcodeproj/project.pbxproj b/MapboxDirections.xcodeproj/project.pbxproj
@@ -9,8 +9,6 @@
 /* Begin PBXBuildFile section */
 		2B01E4B92746ABBC0002A5F7 /* RouteResponseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A3B4C9A24EB55F60085DA64 /* RouteResponseTests.swift */; };
 		2B01E4BA2746ABBD0002A5F7 /* RouteResponseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A3B4C9A24EB55F60085DA64 /* RouteResponseTests.swift */; };
-		2B39DD40270F034700ED68E4 /* CodingOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B39DD3F270F034700ED68E4 /* CodingOperation.swift */; };
-		2B4383022549C22700A3E38B /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B4383002549C22700A3E38B /* main.swift */; };
 		2B28E22327EDB2AA0029E4C1 /* ForeignMemberContainerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B28E22227EDB2A90029E4C1 /* ForeignMemberContainerTests.swift */; };
 		2B28E22427EDB2AA0029E4C1 /* ForeignMemberContainerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B28E22227EDB2A90029E4C1 /* ForeignMemberContainerTests.swift */; };
 		2B28E22527EDB2AA0029E4C1 /* ForeignMemberContainerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B28E22227EDB2A90029E4C1 /* ForeignMemberContainerTests.swift */; };
@@ -491,8 +489,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		2B39DD3F270F034700ED68E4 /* CodingOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CodingOperation.swift; path = Sources/MapboxDirectionsCLI/CodingOperation.swift; sourceTree = "<group>"; };
-		2B4383002549C22700A3E38B /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = main.swift; path = Sources/MapboxDirectionsCLI/main.swift; sourceTree = "<group>"; };
 		2B28E22227EDB2A90029E4C1 /* ForeignMemberContainerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForeignMemberContainerTests.swift; sourceTree = "<group>"; };
 		2B39DD3F270F034700ED68E4 /* CodingOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CodingOperation.swift; path = Sources/MapboxDirectionsCLI/CodingOperation.swift; sourceTree = "<group>"; };
 		2B4383002549C22700A3E38B /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = main.swift; path = Sources/MapboxDirectionsCLI/main.swift; sourceTree = "<group>"; };