From c49bf3359b310c920b447bad1be888240a4dde80 Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Mon, 4 Sep 2023 14:23:07 +0200 Subject: [PATCH] Update dependencies for 2.16.0-rc.1 release (#4537) * Update dependencies for 2.16.0-rc.1 release * Update changelog * Remove @Sendable annotation because it triggers a warning in Xcode 14.x * MapboxNavigation now requires Xcode 14.1 or newer * Fix CircleCI device --- .circleci/config.yml | 8 ++--- CHANGELOG.md | 5 +-- Cartfile | 4 +-- Cartfile.resolved | 6 ++-- MapboxCoreNavigation.podspec | 2 +- .../xcshareddata/swiftpm/Package.resolved | 24 ++++++------- MapboxNavigation.podspec | 2 +- Package.resolved | 16 ++++----- Package.swift | 4 +-- Tests/CocoaPodsTest/PodInstall/Podfile.lock | 34 +++++++++---------- 10 files changed, 53 insertions(+), 52 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 45b2c02036d..c3c043bdfab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -901,10 +901,10 @@ workflows: context: Slack Orb configuration: "Release" - build-job: - name: "Xcode_13.4.1_iOS_13.7" - xcode: "13.4.1" - iOS: "13.7" - device: "iPhone 11 Pro Max" + name: "Xcode_14.1.0_iOS_15.5" + xcode: "14.1.0" + iOS: "15.5" + device: "iPhone 13 Pro Max" spm: true codecoverage: false context: Slack Orb diff --git a/CHANGELOG.md b/CHANGELOG.md index 96324fcb5e7..7a5b3e72545 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,10 @@ ### Packaging +* MapboxNavigation now requires Xcode 14.1 or newer. ([#4537](https://github.com/mapbox/mapbox-navigation-ios/pull/4537)) * MapboxCoreNavigation now requires [MapboxDirections v2.11.0](https://github.com/mapbox/mapbox-directions-swift/releases/tag/v2.11.0). ([#4523](https://github.com/mapbox/mapbox-navigation-ios/pull/4523)) -* MapboxCoreNavigation now requires [MapboxNavigationNative v155._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/155.0.0). ([#4529](https://github.com/mapbox/mapbox-navigation-ios/pull/4529)) -* MapboxNavigation now requires [MapboxMaps v10.16.0-beta.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.16.0-beta.1). ([#4529](https://github.com/mapbox/mapbox-navigation-ios/pull/4529)) +* MapboxCoreNavigation now requires [MapboxNavigationNative v156._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/156.0.0). ([#4537](https://github.com/mapbox/mapbox-navigation-ios/pull/4537)) +* MapboxNavigation now requires [MapboxMaps v10.16.0-rc.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.16.0-rc.1). ([#4537](https://github.com/mapbox/mapbox-navigation-ios/pull/4537)) ### Other changes diff --git a/Cartfile b/Cartfile index c7315eb4473..e3fe304f8a1 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,4 @@ -binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.8.0-beta.1 -binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 155.0.0 +binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.8.0-rc.2 +binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 156.0.0 github "mapbox/mapbox-directions-swift" ~> 2.11.0 github "mapbox/mapbox-events-ios" ~> 1.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index a0e346e8c3b..4a65beff6ce 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,8 +1,8 @@ -binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.8.0-beta.1" -binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "155.0.0" +binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.8.0-rc.2" +binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "156.0.0" github "mapbox/mapbox-directions-swift" "v2.11.0" github "mapbox/mapbox-events-ios" "v1.0.10" -github "mapbox/turf-swift" "v2.6.1" +github "mapbox/turf-swift" "v2.7.0" github "mattgallagher/CwlPreconditionTesting" "2.1.2" github "pointfreeco/swift-snapshot-testing" "1.9.0" github "raphaelmor/Polyline" "v5.1.0" diff --git a/MapboxCoreNavigation.podspec b/MapboxCoreNavigation.podspec index e6ecc08fbf3..de148a0d4c8 100644 --- a/MapboxCoreNavigation.podspec +++ b/MapboxCoreNavigation.podspec @@ -44,7 +44,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.module_name = "MapboxCoreNavigation" - s.dependency "MapboxNavigationNative", "~> 155.0.0" + s.dependency "MapboxNavigationNative", "~> 156.0.0" s.dependency "MapboxDirections", "~> 2.11.0" s.dependency "MapboxMobileEvents", "~> 1.0" diff --git a/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index db8a42aa562..550d5f0f391 100644 --- a/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git", "state": { "branch": null, - "revision": "f285346249993928f1b4b3ad149ce4a22e83b964", - "version": "23.8.0-beta.1" + "revision": "914d9e9c258e036b6758c4b4cf8ef39bc5058f48", + "version": "23.8.0-rc.2" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git", "state": { "branch": null, - "revision": "6d39335dcb53899828120d39ad54a506a18fff53", - "version": "10.16.0-beta.1" + "revision": "c1e3b2d777ab02fcbee43aeaa04398cb7582b0c5", + "version": "10.16.0-rc.2" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git", "state": { "branch": null, - "revision": "f2caa052909061e6e97147bad914716fdbfe672e", - "version": "10.16.0-beta.1" + "revision": "f6fd82d06d835c42649c1d69e9a4c50d3f8d951b", + "version": "10.16.0-rc.1" } }, { @@ -69,8 +69,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git", "state": { "branch": null, - "revision": "27d506ad9c216432aca0cdc8a77625720d2f794d", - "version": "155.0.0" + "revision": "dbdc28cd91cace0b419bc05445835cb7570e90dd", + "version": "156.0.0" } }, { @@ -123,8 +123,8 @@ "repositoryURL": "https://github.com/apple/swift-argument-parser", "state": { "branch": null, - "revision": "fee6933f37fde9a5e12a1e4aeaa93fe60116ff2a", - "version": "1.2.2" + "revision": "8f4d2753f0e4778c76d5f05ad16c74f707390531", + "version": "1.2.3" } }, { @@ -141,8 +141,8 @@ "repositoryURL": "https://github.com/mapbox/turf-swift.git", "state": { "branch": null, - "revision": "87b5b37108ba9f37f0885b586d8f6355d8240dd8", - "version": "2.6.1" + "revision": "f0afe204b4266337066a436becab62fdd2b32378", + "version": "2.7.0" } } ] diff --git a/MapboxNavigation.podspec b/MapboxNavigation.podspec index 918687501e9..07d09880835 100644 --- a/MapboxNavigation.podspec +++ b/MapboxNavigation.podspec @@ -44,7 +44,7 @@ Pod::Spec.new do |s| s.module_name = "MapboxNavigation" s.dependency "MapboxCoreNavigation", "#{s.version.to_s}" - s.dependency "MapboxMaps", "~> 10.16.0-beta.1" + s.dependency "MapboxMaps", "~> 10.16.0-rc.1" s.dependency "Solar-dev", "~> 3.0" s.dependency "MapboxSpeech", "~> 2.0" s.dependency "MapboxMobileEvents", "~> 1.0" diff --git a/Package.resolved b/Package.resolved index 9f91f9819cf..dc6ea5c7e5a 100644 --- a/Package.resolved +++ b/Package.resolved @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git", "state": { "branch": null, - "revision": "e5cb508f09e80b877a695a0914140d95a41152fc", - "version": "23.7.0" + "revision": "914d9e9c258e036b6758c4b4cf8ef39bc5058f48", + "version": "23.8.0-rc.2" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git", "state": { "branch": null, - "revision": "de58d2110c67f657badae735aacd924ca7349c59", - "version": "10.15.0" + "revision": "c1e3b2d777ab02fcbee43aeaa04398cb7582b0c5", + "version": "10.16.0-rc.2" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git", "state": { "branch": null, - "revision": "aeef597eea99f897afcbd03bbc9afc7640bc3801", - "version": "10.15.0" + "revision": "f6fd82d06d835c42649c1d69e9a4c50d3f8d951b", + "version": "10.16.0-rc.1" } }, { @@ -69,8 +69,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git", "state": { "branch": null, - "revision": "20901ac3427e02723ad516ca0d98ccb60da39b5f", - "version": "148.0.0" + "revision": "dbdc28cd91cace0b419bc05445835cb7570e90dd", + "version": "156.0.0" } }, { diff --git a/Package.swift b/Package.swift index 0d6b794a87d..84247f8c1c7 100644 --- a/Package.swift +++ b/Package.swift @@ -24,8 +24,8 @@ let package = Package( dependencies: [ .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.11.0"), .package(name: "MapboxMobileEvents", url: "https://github.com/mapbox/mapbox-events-ios.git", from: "1.0.0"), - .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "155.0.0"), - .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.16.0-beta.1"), + .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "156.0.0"), + .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.16.0-rc.1"), .package(name: "Solar", url: "https://github.com/ceeK/Solar.git", from: "3.0.0"), .package(name: "MapboxSpeech", url: "https://github.com/mapbox/mapbox-speech-swift.git", from: "2.0.0"), .package(name: "CwlPreconditionTesting", url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", from: "2.1.0"), diff --git a/Tests/CocoaPodsTest/PodInstall/Podfile.lock b/Tests/CocoaPodsTest/PodInstall/Podfile.lock index e73f442ad50..750ad0ae1fe 100644 --- a/Tests/CocoaPodsTest/PodInstall/Podfile.lock +++ b/Tests/CocoaPodsTest/PodInstall/Podfile.lock @@ -1,28 +1,28 @@ PODS: - - MapboxCommon (23.8.0-beta.1) - - MapboxCoreMaps (10.16.0-beta.1): - - MapboxCommon (~> 23.8.0-beta) + - MapboxCommon (23.8.0-rc.2) + - MapboxCoreMaps (10.16.0-rc.2): + - MapboxCommon (~> 23.8.0-rc) - MapboxCoreNavigation (2.16.0-beta.1): - MapboxDirections (~> 2.11.0) - MapboxMobileEvents (~> 1.0) - - MapboxNavigationNative (~> 155.0.0) + - MapboxNavigationNative (~> 156.0.0) - MapboxDirections (2.11.0): - Polyline (~> 5.0) - Turf (~> 2.6.1) - - MapboxMaps (10.16.0-beta.1): - - MapboxCommon (= 23.8.0-beta.1) - - MapboxCoreMaps (= 10.16.0-beta.1) + - MapboxMaps (10.16.0-rc.1): + - MapboxCommon (= 23.8.0-rc.2) + - MapboxCoreMaps (= 10.16.0-rc.2) - MapboxMobileEvents (= 1.0.10) - Turf (~> 2.0) - MapboxMobileEvents (1.0.10) - MapboxNavigation (2.16.0-beta.1): - MapboxCoreNavigation (= 2.16.0-beta.1) - - MapboxMaps (~> 10.16.0-beta.1) + - MapboxMaps (~> 10.16.0-rc.1) - MapboxMobileEvents (~> 1.0) - MapboxSpeech (~> 2.0) - Solar-dev (~> 3.0) - - MapboxNavigationNative (155.0.0): - - MapboxCommon (~> 23.8.0-beta.1) + - MapboxNavigationNative (156.0.0): + - MapboxCommon (~> 23.8.0-rc.2) - MapboxSpeech (2.1.1) - Polyline (5.1.0) - Solar-dev (3.0.1) @@ -52,14 +52,14 @@ EXTERNAL SOURCES: :path: "../../../" SPEC CHECKSUMS: - MapboxCommon: fdecf6cb63dc87eaacc6bfaace5a2ad3d2f73199 - MapboxCoreMaps: c195e7ec040fec3ba91a177c280b02ad9054a50e - MapboxCoreNavigation: ee3428a3ef60a2fea661b7ffc8d6308c60bc37c9 + MapboxCommon: 8912693b525746e78162bdfb8248c3ac0596d6a6 + MapboxCoreMaps: 1ebfc8b21881d14aecf47d6bbf96921878aa1f1a + MapboxCoreNavigation: d39722ba7a78e2dfdf70e30ca7cc2dbeaa656d23 MapboxDirections: 0a1bd2321a4cb69f6ce19583848a0bc4bb89952b - MapboxMaps: cfdba9b1cfda2fc6117a31a0754ac8b6aeeff565 + MapboxMaps: aee3fab82e71f9acbbcff0568abc4a5e579d9b66 MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6 - MapboxNavigation: 8f6846457305f0597a0a116a09f9c6aac57d90a8 - MapboxNavigationNative: 8b26481e53f73cd242ac298b5ddfdb5fa27acacf + MapboxNavigation: bd489bcc40cf93f56461f6bcfaa6e61222e1805c + MapboxNavigationNative: 5469a6ba76a373bc52247afd23281a6d761ded3c MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77 Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1 Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0 @@ -67,4 +67,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: bde8103af0e9b326531ee57cf1fa935cbd5f2e18 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1