From 7f99d1609a0726b93f23c05ddd045c362e2a08f7 Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Fri, 19 Jan 2024 14:36:33 +0100 Subject: [PATCH 1/2] Update NN to 182.0.0 and Maps to 10.16.4 --- Cartfile | 4 +-- Cartfile.resolved | 4 +-- MapboxCoreNavigation.podspec | 2 +- .../xcshareddata/swiftpm/Package.resolved | 16 +++++----- MapboxNavigation.podspec | 2 +- Package.resolved | 16 +++++----- Package.swift | 4 +-- Tests/CocoaPodsTest/PodInstall/Podfile.lock | 30 +++++++++---------- 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Cartfile b/Cartfile index 308d55f6ef2..c580aca8838 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ -binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.8.3 -binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 180.0.0 +binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.8.6 +binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 182.0.0 github "mapbox/mapbox-directions-swift" ~> 2.11.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index e89cb619cb3..86042520716 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ -binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.8.5" -binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "180.0.0" +binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.8.6" +binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "182.0.0" github "mapbox/mapbox-directions-swift" "v2.11.1" github "mapbox/turf-swift" "v2.7.0" github "mattgallagher/CwlPreconditionTesting" "2.1.2" diff --git a/MapboxCoreNavigation.podspec b/MapboxCoreNavigation.podspec index a8a833ff653..5d1f8da6d8f 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", "~> 180.0.0" + s.dependency "MapboxNavigationNative", "~> 182.0.0" s.dependency "MapboxDirections", "~> 2.11.1" s.swift_version = "5.5" diff --git a/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5c1b042ef68..95471bac818 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": "f9c766afbc69d2685f8a95157b0c1a177da20465", - "version": "23.8.5" + "revision": "065cb97a83b8bf8d8584ab56cb6ebed898cc0c97", + "version": "23.8.6" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git", "state": { "branch": null, - "revision": "a7847acfef0c62e0a0135804f029e92f026b3c43", - "version": "10.16.3" + "revision": "798644dafccc37c3be17127e39638f39d6cd57e3", + "version": "10.16.4" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git", "state": { "branch": null, - "revision": "1678e9d0cc1d462d2b97473da685464009908b6a", - "version": "10.16.3" + "revision": "05a275f685ac95982716d87ccb677ebad417c252", + "version": "10.16.4" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git", "state": { "branch": null, - "revision": "57c5e8a4adf0fd84def504d68c54f92caddf1b17", - "version": "180.0.0" + "revision": "a8f1894703d5bf605979cfa81b6e0a43bcff53e9", + "version": "182.0.0" } }, { diff --git a/MapboxNavigation.podspec b/MapboxNavigation.podspec index 9023a741173..3cfdaed6b2b 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.3" + s.dependency "MapboxMaps", "~> 10.16.4" s.dependency "Solar-dev", "~> 3.0" s.dependency "MapboxSpeech", "~> 2.0" diff --git a/Package.resolved b/Package.resolved index 6dffe943f84..3af1b3f6048 100644 --- a/Package.resolved +++ b/Package.resolved @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git", "state": { "branch": null, - "revision": "f9c766afbc69d2685f8a95157b0c1a177da20465", - "version": "23.8.5" + "revision": "065cb97a83b8bf8d8584ab56cb6ebed898cc0c97", + "version": "23.8.6" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git", "state": { "branch": null, - "revision": "a7847acfef0c62e0a0135804f029e92f026b3c43", - "version": "10.16.3" + "revision": "798644dafccc37c3be17127e39638f39d6cd57e3", + "version": "10.16.4" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git", "state": { "branch": null, - "revision": "1678e9d0cc1d462d2b97473da685464009908b6a", - "version": "10.16.3" + "revision": "05a275f685ac95982716d87ccb677ebad417c252", + "version": "10.16.4" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git", "state": { "branch": null, - "revision": "57c5e8a4adf0fd84def504d68c54f92caddf1b17", - "version": "180.0.0" + "revision": "a8f1894703d5bf605979cfa81b6e0a43bcff53e9", + "version": "182.0.0" } }, { diff --git a/Package.swift b/Package.swift index 97fa86b85b2..2c493d0e3b5 100644 --- a/Package.swift +++ b/Package.swift @@ -23,8 +23,8 @@ let package = Package( ], dependencies: [ .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.11.1"), - .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "180.0.0"), - .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.16.3"), + .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "182.0.0"), + .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.16.4"), .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 8fea9528d1c..feceb51107d 100644 --- a/Tests/CocoaPodsTest/PodInstall/Podfile.lock +++ b/Tests/CocoaPodsTest/PodInstall/Podfile.lock @@ -1,25 +1,25 @@ PODS: - - MapboxCommon (23.8.5) - - MapboxCoreMaps (10.16.3): + - MapboxCommon (23.8.6) + - MapboxCoreMaps (10.16.4): - MapboxCommon (~> 23.8) - MapboxCoreNavigation (2.18.0-beta.1): - MapboxDirections (~> 2.11.1) - - MapboxNavigationNative (~> 180.0.0) + - MapboxNavigationNative (~> 182.0.0) - MapboxDirections (2.11.1): - Polyline (~> 5.0) - Turf (~> 2.6.1) - - MapboxMaps (10.16.3): - - MapboxCommon (= 23.8.5) - - MapboxCoreMaps (= 10.16.3) + - MapboxMaps (10.16.4): + - MapboxCommon (= 23.8.6) + - MapboxCoreMaps (= 10.16.4) - MapboxMobileEvents (= 1.0.10) - Turf (~> 2.0) - MapboxMobileEvents (1.0.10) - MapboxNavigation (2.18.0-beta.1): - MapboxCoreNavigation (= 2.18.0-beta.1) - - MapboxMaps (~> 10.16.3) + - MapboxMaps (~> 10.16.4) - MapboxSpeech (~> 2.0) - Solar-dev (~> 3.0) - - MapboxNavigationNative (180.0.0): + - MapboxNavigationNative (182.0.0): - MapboxCommon (~> 23.8) - MapboxSpeech (2.1.1) - Polyline (5.1.0) @@ -50,14 +50,14 @@ EXTERNAL SOURCES: :path: "../../../" SPEC CHECKSUMS: - MapboxCommon: 677dd4449e9f7d863a4712cf271c198ed1753494 - MapboxCoreMaps: 304d4ff1de0b5873e4ce359a7ed107fe65f89bd6 - MapboxCoreNavigation: 0a951b1e0c058b6130a5776e8f6f71e1b99ee70a + MapboxCommon: 90f76693dc02438acbb5ea9a5b266a4c0eb1c875 + MapboxCoreMaps: 7b07d1ca8c454a4381daf09df901b9d6bf90bce0 + MapboxCoreNavigation: a9b6fca52022442d2ce797bead869df33404c786 MapboxDirections: 31d61b8369d5dde6f6828f72905ab9a7e054cd2c - MapboxMaps: 89322569ce8b0e98ed2a84c3289e6bc402df6073 + MapboxMaps: cbb38845a9bf49b124f0e937975d560a4e01894e MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6 - MapboxNavigation: 3b1a33de7fd3492430a5ac394224802942fdeb9b - MapboxNavigationNative: 4ee7dbe7a9b898786a8b43dc055d613eb60163e2 + MapboxNavigation: 37d1da09035c613223be06c4b87633a77f5bc6c1 + MapboxNavigationNative: f2cbb7eddb712a541edb7f4c9ed286f02ede5c12 MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77 Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1 Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0 @@ -65,4 +65,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: bde8103af0e9b326531ee57cf1fa935cbd5f2e18 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 From 5b5ae9434d16235afa8be41b4ba8f682bfc64dfa Mon Sep 17 00:00:00 2001 From: Alex Azarov Date: Fri, 19 Jan 2024 14:39:40 +0100 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40c8968074a..eb0072ab074 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,8 @@ ### Packaging -* MapboxNavigation now requires [MapboxMaps v10.16.3](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.16.3). ([#4572](https://github.com/mapbox/mapbox-navigation-ios/pull/4572)) -* MapboxCoreNavigation now requires [MapboxNavigationNative v180._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/180.0.0). ([#4572](https://github.com/mapbox/mapbox-navigation-ios/pull/4572)) +* MapboxNavigation now requires [MapboxMaps v10.16.4](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.16.4). ([#4585](https://github.com/mapbox/mapbox-navigation-ios/pull/4585)) +* MapboxCoreNavigation now requires [MapboxNavigationNative v182._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/182.0.0). ([#4585](https://github.com/mapbox/mapbox-navigation-ios/pull/4585)) * MapboxCoreNavigation is no longer dependent on MapboxMobileEvents. ([#4572](https://github.com/mapbox/mapbox-navigation-ios/pull/4572)) ### Routing