Update to NavNative 148.0.0, Maps 10.15.0, Common 23.7.0 (#4518)

* Update to NavNative 148.0.0, Maps 10.15.0, Common 23.7.0 * Support NavNative API changes
mapbox · Aug 4, 2023 · 5506a9d · 5506a9d
1 parent df4b4fe
commit 5506a9d
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,8 @@
 
 ### Packaging
 
-* MapboxCoreNavigation now requires [MapboxNavigationNative v144._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/144.0.0). ([#4506](https://github.com/mapbox/mapbox-navigation-ios/pull/4506))
-* MapboxNavigation now requires [MapboxMaps v10.15.0-rc.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.15.0-rc.1). ([#4506](https://github.com/mapbox/mapbox-navigation-ios/pull/4506))
+* MapboxCoreNavigation now requires [MapboxNavigationNative v148._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/148.0.0). ([#4518](https://github.com/mapbox/mapbox-navigation-ios/pull/4518))
+* MapboxNavigation now requires [MapboxMaps v10.15.0](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.15.0). ([#4518](https://github.com/mapbox/mapbox-navigation-ios/pull/4518))
 
 ### Routing
 *  Route request timeout errors are now considered failures as opposed to cancellations. `RouterDelegate.router(_:didFailToRerouteWith:)` will be called in this case. ([#4490](https://github.com/mapbox/mapbox-navigation-ios/pull/4490))

diff --git a/Cartfile b/Cartfile
@@ -1,4 +1,4 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.7.0-rc.1
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 144.0.0
+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
 github "mapbox/mapbox-directions-swift" ~> 2.10.0
 github "mapbox/mapbox-events-ios" ~> 1.0.0
diff --git 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-rc.1"
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "144.0.0"
+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"
 github "mapbox/mapbox-directions-swift" "v2.10.0"
 github "mapbox/mapbox-events-ios" "v1.0.10"
 github "mapbox/turf-swift" "v2.6.1"

diff --git 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", "~> 144.0.0"
+  s.dependency "MapboxNavigationNative", "~> 148.0.0"
   s.dependency "MapboxDirections", "~> 2.10.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
@@ -24,17 +24,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
         "state": {
           "branch": null,
-          "revision": "19f2617131b69d2df4e282f6ee68fa68d7ec1f70",
-          "version": "23.7.0-rc.1"
+          "revision": "e5cb508f09e80b877a695a0914140d95a41152fc",
+          "version": "23.7.0"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "2cbc9f3a4c0168d7ee3acd92de81a49a357def70",
-          "version": "10.15.0-rc.1"
+          "revision": "de58d2110c67f657badae735aacd924ca7349c59",
+          "version": "10.15.0"
         }
       },
       {
@@ -60,17 +60,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "0b7df0c6e6fbbb390651472057df44f6d0b18535",
-          "version": "10.15.0-rc.1"
+          "revision": "aeef597eea99f897afcbd03bbc9afc7640bc3801",
+          "version": "10.15.0"
         }
       },
       {
         "package": "MapboxNavigationNative",
         "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
         "state": {
           "branch": null,
-          "revision": "8cf20c568504957211e14c176bb2895bc8518c7f",
-          "version": "144.0.0"
+          "revision": "20901ac3427e02723ad516ca0d98ccb60da39b5f",
+          "version": "148.0.0"
         }
       },
       {

diff --git 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-rc.1"
+  s.dependency "MapboxMaps", "~> 10.15.0"
   s.dependency "Solar-dev", "~> 3.0"
   s.dependency "MapboxSpeech", "~> 2.0"
   s.dependency "MapboxMobileEvents", "~> 1.0"

diff --git a/Package.resolved b/Package.resolved
@@ -24,17 +24,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
         "state": {
           "branch": null,
-          "revision": "f46c17b958f465c120d89bff4c4fa888a8d4a798",
-          "version": "23.7.0-beta.1"
+          "revision": "e5cb508f09e80b877a695a0914140d95a41152fc",
+          "version": "23.7.0"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "55f883970d3ed0a489353dc2f765ae4120bc5533",
-          "version": "10.15.0-beta.1"
+          "revision": "de58d2110c67f657badae735aacd924ca7349c59",
+          "version": "10.15.0"
         }
       },
       {
@@ -60,17 +60,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "c6b7ec640f26657c23674c9a051fcabba4ebcf27",
-          "version": "10.15.0-beta.1"
+          "revision": "aeef597eea99f897afcbd03bbc9afc7640bc3801",
+          "version": "10.15.0"
         }
       },
       {
         "package": "MapboxNavigationNative",
         "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
         "state": {
           "branch": null,
-          "revision": "bedbb75271ed9d09b2ec8097683f1e55a3b9941a",
-          "version": "142.0.0"
+          "revision": "20901ac3427e02723ad516ca0d98ccb60da39b5f",
+          "version": "148.0.0"
         }
       },
       {

diff --git 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.10.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: "144.0.0"),
-        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.15.0-rc.1")),
+        .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: "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/Sources/TestHelper/NavNative/TestNavigationStatusProvider.swift b/Sources/TestHelper/NavNative/TestNavigationStatusProvider.swift
@@ -50,9 +50,9 @@ public final class TestNavigationStatusProvider {
                      offRoadProba: 0,
                      offRoadStateProvider: .unknown,
                      activeGuidanceInfo: activeGuidanceInfo,
-                     upcomingRouteAlerts: [],
                      upcomingRouteAlertUpdates: upcomingRouteAlertUpdates,
                      nextWaypointIndex: 0,
-                     layer: nil)
+                     layer: nil,
+                     isSyntheticLocation: false)
     }
 }
diff --git a/Tests/CocoaPodsTest/PodInstall/Podfile.lock b/Tests/CocoaPodsTest/PodInstall/Podfile.lock
@@ -1,28 +1,28 @@
 PODS:
-  - MapboxCommon (23.7.0-rc.1)
-  - MapboxCoreMaps (10.15.0-rc.1):
-    - MapboxCommon (~> 23.7.0-rc)
+  - MapboxCommon (23.7.0)
+  - MapboxCoreMaps (10.15.0):
+    - MapboxCommon (~> 23.7)
   - MapboxCoreNavigation (2.15.0-beta.1):
     - MapboxDirections (~> 2.10.0)
     - MapboxMobileEvents (~> 1.0)
-    - MapboxNavigationNative (~> 144.0.0)
+    - MapboxNavigationNative (~> 148.0.0)
   - MapboxDirections (2.10.0):
     - Polyline (~> 5.0)
     - Turf (~> 2.6.1)
-  - MapboxMaps (10.15.0-rc.1):
-    - MapboxCommon (= 23.7.0-rc.1)
-    - MapboxCoreMaps (= 10.15.0-rc.1)
+  - MapboxMaps (10.15.0):
+    - MapboxCommon (= 23.7.0)
+    - MapboxCoreMaps (= 10.15.0)
     - 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-rc.1)
+    - MapboxMaps (~> 10.15.0)
     - MapboxMobileEvents (~> 1.0)
     - MapboxSpeech (~> 2.0)
     - Solar-dev (~> 3.0)
-  - MapboxNavigationNative (144.0.0):
-    - MapboxCommon (~> 23.7.0-rc.1)
+  - MapboxNavigationNative (148.0.0):
+    - MapboxCommon (~> 23.7)
   - MapboxSpeech (2.1.1)
   - Polyline (5.1.0)
   - Solar-dev (3.0.1)
@@ -52,19 +52,19 @@ EXTERNAL SOURCES:
     :path: "../../../"
 
 SPEC CHECKSUMS:
-  MapboxCommon: b2fa75180a508e5e791dff847f4162f855900ac7
-  MapboxCoreMaps: 306bf4676c684bd44a7c132f95685cf2cb4db045
-  MapboxCoreNavigation: 10e78e816a0e453aa03b0b7b33747adca1c90de7
+  MapboxCommon: dcbdb86acbcfc1a23efd341ed097c6c63ab532a9
+  MapboxCoreMaps: bcbaac14467616940187f79bba49ca491cd37906
+  MapboxCoreNavigation: 8516c06f9261cd0551faa7139b563df5e6326276
   MapboxDirections: a620d78a54312c392323ba211df8ae7dd9a28ab4
-  MapboxMaps: 3f884dca3b4c488f8bb2dc09e9a4d946ca64ea9c
+  MapboxMaps: 1fd9d97d0e8eceb7a45b9ac8bf87a8922da881a8
   MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
-  MapboxNavigation: e02a9477ed75ada8cd68740c9e1c0156fb484f4e
-  MapboxNavigationNative: b53f5eef5b6ae56d70827197377893aa9c80a67d
+  MapboxNavigation: 1697c3d8b5cda84ca4ac3e663ef80723cf2f8cd4
+  MapboxNavigationNative: 69682e4b092788bea0a80f56fae3f148cb3e177a
   MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77
   Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
   Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0
   Turf: 469ce2c3d22e5e8e4818d5a3b254699a5c89efa4
 
 PODFILE CHECKSUM: bde8103af0e9b326531ee57cf1fa935cbd5f2e18
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/Tests/MapboxCoreNavigationTests/Progress/RouteProgressTests.swift b/Tests/MapboxCoreNavigationTests/Progress/RouteProgressTests.swift
@@ -343,10 +343,10 @@ class RouteProgressTests: TestCase {
                     legProgress: .init(distanceTraveled: 0, fractionTraveled: 0, remainingDistance: 0, remainingDuration: 0),
                     step: .init(distanceTraveled: stepDistanceTraveled, fractionTraveled: 0, remainingDistance: 0, remainingDuration: 0)
                 ),
-                upcomingRouteAlerts: [],
                 upcomingRouteAlertUpdates: [],
                 nextWaypointIndex: 0,
-                layer: nil
+                layer: nil,
+                isSyntheticLocation: false
             )
         }