From aaabcf1498a10e37fda7f71223f226e7a5237baf Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Tue, 28 May 2024 16:24:20 +0200 Subject: [PATCH 01/12] Update Turf to 2.8.0 --- Cartfile | 2 +- MapboxDirections.podspec | 2 +- Package.resolved | 4 ++-- Package.swift | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cartfile b/Cartfile index 54f33f46..51ef3a54 100644 --- 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 index 73fb9a88..e7acdf57 100644 --- 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 index d52ac1da..6eec86f4 100644 --- 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 index de2290c3..e4496318 100644 --- 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") ], From a943e59fa9745aed32b3b84c2be06d5101d9f957 Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Tue, 28 May 2024 16:28:39 +0200 Subject: [PATCH 02/12] Update changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 504c63c6..b3354347 100644 --- 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)) From 01ed85ca87467aab79bab3437549aa544a691c03 Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Tue, 28 May 2024 16:31:27 +0200 Subject: [PATCH 03/12] Bump Ubuntu runner Swift version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d10b45ac..a4cbfe63 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -153,7 +153,7 @@ jobs: fi spm-linux-job: docker: - - image: swift:5.6 + - image: swift:5.7 steps: - checkout - run: swift build From 301ae6658079772972759ee8f4d3d31e1b3957d9 Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Tue, 28 May 2024 16:33:46 +0200 Subject: [PATCH 04/12] Update Xcode runners --- .circleci/config.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a4cbfe63..d26130e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -117,7 +117,7 @@ step-library: jobs: detect-breaking-changes: macos: - xcode: 13.4.1 + xcode: 14.3.1 steps: - checkout - install-mapbox-token @@ -192,7 +192,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 +210,19 @@ jobs: parameters: xcode: type: string - default: "13.4.1" + default: "14.3.1" device: type: string default: "iPhone 13" 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 @@ -287,7 +287,7 @@ jobs: parameters: xcode: type: string - default: "13.4.1" + default: "14.3.1" macos: xcode: << parameters.xcode >> environment: @@ -315,7 +315,7 @@ jobs: parameters: xcode: type: string - default: "13.4.1" + default: "14.3.1" macos: xcode: << parameters.xcode >> environment: @@ -367,16 +367,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" From 16aacd8a26a3cc0ef9c58ae2060e1db3069cbaa7 Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Tue, 28 May 2024 16:58:01 +0200 Subject: [PATCH 05/12] Update OHHTTPStubs --- Cartfile.private | 2 +- Cartfile.resolved | 2 +- Package.resolved | 4 ++-- Package.swift | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 0f2d3cba..c6004114 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,2 +1,2 @@ -github "AliSoftware/OHHTTPStubs" ~> 9.0 +github "AliSoftware/OHHTTPStubs" "c582400a38590a3dabb4353416d9d46cb7278d06" # Xcode 14.3+ support github "mapbox/mapbox-events-ios" ~> 0.10 diff --git a/Cartfile.resolved b/Cartfile.resolved index 8f37a27a..35e1f7df 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "AliSoftware/OHHTTPStubs" "9.1.0" +github "AliSoftware/OHHTTPStubs" "c582400a38590a3dabb4353416d9d46cb7278d06" github "mapbox/mapbox-events-ios" "v0.10.14" github "mapbox/turf-swift" "v2.8.0" github "raphaelmor/Polyline" "v5.1.0" diff --git a/Package.resolved b/Package.resolved index 6eec86f4..e507f1fe 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/AliSoftware/OHHTTPStubs", "state": { "branch": null, - "revision": "12f19662426d0434d6c330c6974d53e2eb10ecd9", - "version": "9.1.0" + "revision": "c582400a38590a3dabb4353416d9d46cb7278d06", + "version": null } }, { diff --git a/Package.swift b/Package.swift index e4496318..b9446dd4 100644 --- a/Package.swift +++ b/Package.swift @@ -23,7 +23,7 @@ let package = Package( .package(url: "https://github.com/raphaelmor/Polyline.git", from: "5.0.2"), .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") + .package(url: "https://github.com/AliSoftware/OHHTTPStubs", revision: "c582400a38590a3dabb4353416d9d46cb7278d06") // Xcode 14.3+ support ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. From c7a41cdb78263a602aae44dffed9ecd4ce178f2c Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Wed, 29 May 2024 15:18:45 +0200 Subject: [PATCH 06/12] Change workaround for OHHTTPStubs and Xcode 14.3+ --- .circleci/config.yml | 6 +++++- Cartfile.private | 2 +- Cartfile.resolved | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d26130e7..e95b8c7c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,11 @@ 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 + carthage build --platform all --cache-builds --configuration Debug --use-xcframeworks install-mbx-ci: steps: - run: diff --git a/Cartfile.private b/Cartfile.private index c6004114..0f2d3cba 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,2 +1,2 @@ -github "AliSoftware/OHHTTPStubs" "c582400a38590a3dabb4353416d9d46cb7278d06" # Xcode 14.3+ support +github "AliSoftware/OHHTTPStubs" ~> 9.0 github "mapbox/mapbox-events-ios" ~> 0.10 diff --git a/Cartfile.resolved b/Cartfile.resolved index 35e1f7df..8f37a27a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "AliSoftware/OHHTTPStubs" "c582400a38590a3dabb4353416d9d46cb7278d06" +github "AliSoftware/OHHTTPStubs" "9.1.0" github "mapbox/mapbox-events-ios" "v0.10.14" github "mapbox/turf-swift" "v2.8.0" github "raphaelmor/Polyline" "v5.1.0" From b31c8a80566840839be299a6a5ee346984e4919b Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Wed, 29 May 2024 17:29:06 +0200 Subject: [PATCH 07/12] Patch IPHONEOS_DEPLOYMENT_TARGET --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e95b8c7c..33294c21 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,6 +54,7 @@ commands: 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: From 742a8aa928b672391be6db53a437c6ff58a3bec5 Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Wed, 29 May 2024 17:42:55 +0200 Subject: [PATCH 08/12] Fix simulator model --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 33294c21..424ca7a9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -218,7 +218,7 @@ jobs: default: "14.3.1" device: type: string - default: "iPhone 13" + default: "iPhone 14" iOS: type: string default: "16.4" From 76560d625d6f4846ea6979d4cedf9d4055ed195c Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Wed, 29 May 2024 18:10:05 +0200 Subject: [PATCH 09/12] Fix watchOS simulator model --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 424ca7a9..052d8dbe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -267,7 +267,7 @@ jobs: command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections Mac' clean build<<# parameters.test >> test <><<# parameters.codecoverage >>-enableCodeCoverage YES<> - 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 - 44mm,OS=<< parameters.watchOS >>' clean build - save-cache publish-documentation: From e5b0945a3f1e0bc362cf399bf3cfc20596d89cf0 Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Wed, 29 May 2024 18:18:09 +0200 Subject: [PATCH 10/12] Revert Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index b9446dd4..e4496318 100644 --- a/Package.swift +++ b/Package.swift @@ -23,7 +23,7 @@ let package = Package( .package(url: "https://github.com/raphaelmor/Polyline.git", from: "5.0.2"), .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", revision: "c582400a38590a3dabb4353416d9d46cb7278d06") // Xcode 14.3+ support + .package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.1.0") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. From dc96f75828b7e84a87247d3646830f99f0d93adb Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Wed, 29 May 2024 18:30:43 +0200 Subject: [PATCH 11/12] Fix watchOS simulator model --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 052d8dbe..6a205d96 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -267,7 +267,7 @@ jobs: command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections Mac' clean build<<# parameters.test >> test <><<# parameters.codecoverage >>-enableCodeCoverage YES<> - run: name: watchOS - command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 7 - 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: From bd8ef052ec4a1c0b95ce394ba08ad4208eb2cc7c Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Wed, 29 May 2024 18:40:28 +0200 Subject: [PATCH 12/12] Update Package.resolved --- Package.resolved | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.resolved b/Package.resolved index e507f1fe..6eec86f4 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/AliSoftware/OHHTTPStubs", "state": { "branch": null, - "revision": "c582400a38590a3dabb4353416d9d46cb7278d06", - "version": null + "revision": "12f19662426d0434d6c330c6974d53e2eb10ecd9", + "version": "9.1.0" } }, {