Update Turf to 2.8.0 (#825)

* Update Turf to 2.8.0 * Update changelog * Bump Ubuntu runner Swift version * Update Xcode runners * Update OHHTTPStubs * Change workaround for OHHTTPStubs and Xcode 14.3+ * Patch IPHONEOS_DEPLOYMENT_TARGET * Fix simulator model * Fix watchOS simulator model * Revert Package.swift * Fix watchOS simulator model * Update Package.resolved
mapbox · May 30, 2024 · eadeeae · eadeeae
1 parent 6d29686
commit eadeeae
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 22 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -50,7 +50,12 @@ commands:
         steps:
             - run:
                 name: Dependencies
-                command: carthage bootstrap --platform all --cache-builds --configuration Debug --use-xcframeworks
+                command: |
+                  carthage checkout
+                  # Workaround for OHHTTPStubs not supporting Xcode 14.3+
+                  sed -i '' 's/MACOSX_DEPLOYMENT_TARGET = 10.9/MACOSX_DEPLOYMENT_TARGET = 10.13/g' Carthage/Checkouts/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
+                  sed -i '' 's/IPHONEOS_DEPLOYMENT_TARGET = 8.0/IPHONEOS_DEPLOYMENT_TARGET = 12.0/g' Carthage/Checkouts/OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
+                  carthage build --platform all --cache-builds --configuration Debug --use-xcframeworks
     install-mbx-ci:
       steps:
         - run:
@@ -117,7 +122,7 @@ step-library:
 jobs:
   detect-breaking-changes:
     macos:
-      xcode: 13.4.1
+      xcode: 14.3.1
     steps:
       - checkout
       - install-mapbox-token
@@ -153,7 +158,7 @@ jobs:
             fi
   spm-linux-job:
     docker:
-      - image: swift:5.6
+      - image: swift:5.7
     steps:
       - checkout
       - run: swift build
@@ -192,7 +197,7 @@ jobs:
             carthage bootstrap --platform all --use-netrc --use-xcframeworks
   example-app-build:
     macos:
-      xcode: "13.4.1"
+      xcode: "14.3.1"
     environment:
       HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
@@ -210,19 +215,19 @@ jobs:
     parameters:
       xcode:
         type: string
-        default: "13.4.1"
+        default: "14.3.1"
       device:
         type: string
-        default: "iPhone 13"
+        default: "iPhone 14"
       iOS:
         type: string
-        default: "15.5"
+        default: "16.4"
       watchOS:
         type: string
-        default: "8.5"
+        default: "9.4"
       tvOS:
         type: string
-        default: "15.4"
+        default: "16.4"
       test:
         type: boolean
         default: true
@@ -262,7 +267,7 @@ jobs:
           command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections Mac' clean build<<# parameters.test >> test <</ parameters.test >><<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
       - run:
           name: watchOS
-          command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 5 - 44mm,OS=<< parameters.watchOS >>' clean build
+          command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 7 (41mm),OS=<< parameters.watchOS >>' clean build
       - save-cache
 
   publish-documentation:
@@ -287,7 +292,7 @@ jobs:
     parameters:
       xcode:
         type: string
-        default: "13.4.1"
+        default: "14.3.1"
     macos:
       xcode: << parameters.xcode >>
     environment:
@@ -315,7 +320,7 @@ jobs:
     parameters:
       xcode:
         type: string
-        default: "13.4.1"
+        default: "14.3.1"
     macos:
       xcode: << parameters.xcode >>
     environment:
@@ -367,16 +372,16 @@ workflows:
       - detect-breaking-changes:
           name: "Detect Breaking Changes"
       - build-job:
-          name: "Dev Build: Xcode 13.4.1"
+          name: "Dev Build: Xcode 14.3.1"
       - carthage-integration-test:
-          name: "Carthage Integration Test 13.4.1"
-          xcode: "13.4.1"
+          name: "Carthage Integration Test 14.3.1"
+          xcode: "14.3.1"
       - carthage-integration-test:
           name: "Carthage Integration Test 14.0.0"
           xcode: "14.0.0"
       - spm-job:
-          name: "SPM build 13.4.1"
-          xcode: "13.4.1"
+          name: "SPM build 14.3.1"
+          xcode: "14.3.1"
       - spm-job:
           name: "SPM build 14.1.0"
           xcode: "14.1.0"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changes to Mapbox Directions for Swift
 
+
+## v2.13.0
+
+* This library now depends on Turf v2.8.x. ([#825](https://github.com/mapbox/mapbox-directions-swift/pull/825))
+
+## v2.12.0
+
+* This library now depends on Turf v2.7.x. ([#819](https://github.com/mapbox/mapbox-directions-swift/pull/819))
+
 ## v2.11.0
 
 * Added `Incident.trafficCodes` and corresponding `TrafficCodes` struct to hold jartic codes. ([#808](https://github.com/mapbox/mapbox-directions-swift/pull/808))

diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
 github "raphaelmor/Polyline" ~> 5.0
-github "mapbox/turf-swift" ~> 2.7.0
+github "mapbox/turf-swift" ~> 2.8.0
diff --git a/MapboxDirections.podspec b/MapboxDirections.podspec
@@ -46,6 +46,6 @@ Pod::Spec.new do |s|
   s.swift_version = "5.5"
 
   s.dependency "Polyline", "~> 5.0"
-  s.dependency "Turf", "~> 2.7.0"
+  s.dependency "Turf", "~> 2.8.0"
 
 end
diff --git a/Package.resolved b/Package.resolved
@@ -33,8 +33,8 @@
         "repositoryURL": "https://github.com/mapbox/turf-swift.git",
         "state": {
           "branch": null,
-          "revision": "42926cfbb4f024e7823103638f0186f4b0f947ef",
-          "version": "2.7.1"
+          "revision": "213050191cfcb3d5aa76e1fa90c6ff1e182a42ca",
+          "version": "2.8.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -21,7 +21,7 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         .package(url: "https://github.com/raphaelmor/Polyline.git", from: "5.0.2"),
-        .package(name: "Turf", url: "https://github.com/mapbox/turf-swift.git", "2.7.0"..<"2.8.0"),
+        .package(name: "Turf", url: "https://github.com/mapbox/turf-swift.git", "2.8.0"..<"2.9.0"),
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
         .package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.1.0")
     ],