From cace1972897917fe23c1c212ff0d77c3900f6250 Mon Sep 17 00:00:00 2001 From: Victor Kononov Date: Fri, 18 Aug 2023 10:52:37 +0300 Subject: [PATCH] Dependency update (#4529) * vk/dependency-update: bumped NN to v155 and Maps to v10.16.0-beta.1; CHANGELOG updated --- CHANGELOG.md | 2 ++ Cartfile | 4 +-- Cartfile.resolved | 4 +-- MapboxCoreNavigation.podspec | 2 +- .../xcshareddata/swiftpm/Package.resolved | 16 +++++----- MapboxNavigation.podspec | 2 +- Package.swift | 4 +-- Tests/CocoaPodsTest/PodInstall/Podfile.lock | 32 +++++++++---------- 8 files changed, 34 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4726031bf2..6a0c41c15ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ ### Packaging * 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)) ### Other changes diff --git a/Cartfile b/Cartfile index f5e827d888b..c7315eb4473 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,4 @@ -binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.7.0 -binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 148.0.0 +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 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 ad1cab58d99..a0e346e8c3b 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ -binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.7.0" -binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "148.0.0" +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" github "mapbox/mapbox-directions-swift" "v2.11.0" github "mapbox/mapbox-events-ios" "v1.0.10" github "mapbox/turf-swift" "v2.6.1" diff --git a/MapboxCoreNavigation.podspec b/MapboxCoreNavigation.podspec index 3df0a747c95..30ea55d26b4 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", "~> 148.0.0" + s.dependency "MapboxNavigationNative", "~> 155.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 79e96258f00..db8a42aa562 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": "e5cb508f09e80b877a695a0914140d95a41152fc", - "version": "23.7.0" + "revision": "f285346249993928f1b4b3ad149ce4a22e83b964", + "version": "23.8.0-beta.1" } }, { @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git", "state": { "branch": null, - "revision": "de58d2110c67f657badae735aacd924ca7349c59", - "version": "10.15.0" + "revision": "6d39335dcb53899828120d39ad54a506a18fff53", + "version": "10.16.0-beta.1" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git", "state": { "branch": null, - "revision": "aeef597eea99f897afcbd03bbc9afc7640bc3801", - "version": "10.15.0" + "revision": "f2caa052909061e6e97147bad914716fdbfe672e", + "version": "10.16.0-beta.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": "27d506ad9c216432aca0cdc8a77625720d2f794d", + "version": "155.0.0" } }, { diff --git a/MapboxNavigation.podspec b/MapboxNavigation.podspec index 7dd67132fad..9f11ce163f1 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.15.0" + s.dependency "MapboxMaps", "~> 10.16.0-beta.1" s.dependency "Solar-dev", "~> 3.0" s.dependency "MapboxSpeech", "~> 2.0" s.dependency "MapboxMobileEvents", "~> 1.0" diff --git a/Package.swift b/Package.swift index 1055f28e025..0d6b794a87d 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: "148.0.0"), - .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.15.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: "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 9aaaba62090..5ffcbd180a2 100644 --- a/Tests/CocoaPodsTest/PodInstall/Podfile.lock +++ b/Tests/CocoaPodsTest/PodInstall/Podfile.lock @@ -1,28 +1,28 @@ PODS: - - MapboxCommon (23.7.0) - - MapboxCoreMaps (10.15.0): - - MapboxCommon (~> 23.7) + - MapboxCommon (23.8.0-beta.1) + - MapboxCoreMaps (10.16.0-beta.1): + - MapboxCommon (~> 23.8.0-beta) - MapboxCoreNavigation (2.15.0-beta.1): - MapboxDirections (~> 2.11.0) - MapboxMobileEvents (~> 1.0) - - MapboxNavigationNative (~> 148.0.0) + - MapboxNavigationNative (~> 155.0.0) - MapboxDirections (2.11.0): - Polyline (~> 5.0) - Turf (~> 2.6.1) - - MapboxMaps (10.15.0): - - MapboxCommon (= 23.7.0) - - MapboxCoreMaps (= 10.15.0) + - MapboxMaps (10.16.0-beta.1): + - MapboxCommon (= 23.8.0-beta.1) + - MapboxCoreMaps (= 10.16.0-beta.1) - MapboxMobileEvents (= 1.0.10) - Turf (~> 2.0) - MapboxMobileEvents (1.0.10) - MapboxNavigation (2.15.0-beta.1): - MapboxCoreNavigation (= 2.15.0-beta.1) - - MapboxMaps (~> 10.15.0) + - MapboxMaps (~> 10.16.0-beta.1) - MapboxMobileEvents (~> 1.0) - MapboxSpeech (~> 2.0) - Solar-dev (~> 3.0) - - MapboxNavigationNative (148.0.0): - - MapboxCommon (~> 23.7) + - MapboxNavigationNative (155.0.0): + - MapboxCommon (~> 23.8.0-beta.1) - MapboxSpeech (2.1.1) - Polyline (5.1.0) - Solar-dev (3.0.1) @@ -52,14 +52,14 @@ EXTERNAL SOURCES: :path: "../../../" SPEC CHECKSUMS: - MapboxCommon: dcbdb86acbcfc1a23efd341ed097c6c63ab532a9 - MapboxCoreMaps: bcbaac14467616940187f79bba49ca491cd37906 - MapboxCoreNavigation: 51b736750be0e321227d94e1e28ef59b86d60bf7 + MapboxCommon: fdecf6cb63dc87eaacc6bfaace5a2ad3d2f73199 + MapboxCoreMaps: c195e7ec040fec3ba91a177c280b02ad9054a50e + MapboxCoreNavigation: 92c9dc0df864f5a08dd984a5ac483ae031887386 MapboxDirections: 0a1bd2321a4cb69f6ce19583848a0bc4bb89952b - MapboxMaps: 1fd9d97d0e8eceb7a45b9ac8bf87a8922da881a8 + MapboxMaps: cfdba9b1cfda2fc6117a31a0754ac8b6aeeff565 MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6 - MapboxNavigation: 1697c3d8b5cda84ca4ac3e663ef80723cf2f8cd4 - MapboxNavigationNative: 69682e4b092788bea0a80f56fae3f148cb3e177a + MapboxNavigation: 5c9f461e46ef45514c4207f057c4330d038f871b + MapboxNavigationNative: 8b26481e53f73cd242ac298b5ddfdb5fa27acacf MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77 Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1 Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0