Update dependencies: Common SDK to 23.6.0, Maps 10.14.0, NN to 137.0…

….0 (#4483) * [Snapshot] Update dependencies: Common SDK to 23.6.0, Maps 10.14.0, NN to 137.0.0 # Conflicts: # Tests/CocoaPodsTest/PodInstall/Podfile.lock
mapbox · Jun 22, 2023 · 27dce44 · 27dce44
1 parent aa2ea7e
commit 27dce44
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,20 +4,23 @@
 
 ### Packaging
 
-* MapboxCoreNavigation now requires [MapboxNavigationNative v136._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/136.0.0). ([#4472](https://github.com/mapbox/mapbox-navigation-ios/pull/4472))
+* MapboxCoreNavigation now requires [MapboxNavigationNative v137._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/137.0.0). ([#4483](https://github.com/mapbox/mapbox-navigation-ios/pull/4483))
 * MapboxNavigation now requires [MapboxMaps v10.14.0-rc.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.14.0-rc.1). ([#4472](https://github.com/mapbox/mapbox-navigation-ios/pull/4472))
 
 ### CarPlay
 
 * Fixed an issue where starting navigation while connected to CarPlay but not having window active resulted in CarPlay view to be stuck at preview screen. ([#4477](https://github.com/mapbox/mapbox-navigation-ios/pull/4477))
 * Fixed an issue where maneuver arrow was not changing color following day/night style automatic toggling. ([#4482](https://github.com/mapbox/mapbox-navigation-ios/pull/4482))
 
+### Routing
+* Fixed an issue where `NavigationSettings.tileStoreConfiguration.navigatorLocation.tileStoreURL` was used as a base url for route refresh requests instead of `NavigationSettings.directions.credentials.host`. ([#4483](https://github.com/mapbox/mapbox-navigation-ios/pull/4483))
+
 ### Other changes
 
 * Optimized performance of route response parsing for reroutes, continuous alternatives and similar use-cases. ([#4462](https://github.com/mapbox/mapbox-navigation-ios/pull/4462))
 * Fixed inconsistent time difference callouts positions for alternative routes. ([#4473](https://github.com/mapbox/mapbox-navigation-ios/pull/4473))
-* Fixed an issue with too high alternative route requests frequency in case of only one route being present in the route response.
-* Fixed an issue with positioning lag in tunnels.
+* Fixed an issue with too high alternative route requests frequency in case of only one route being present in the route response. ([#4483](https://github.com/mapbox/mapbox-navigation-ios/pull/4472))
+* Fixed an issue with positioning lag in tunnels. ([#4483](https://github.com/mapbox/mapbox-navigation-ios/pull/4472))
 
 ## v2.13.0
 

diff --git a/Cartfile b/Cartfile
@@ -1,4 +1,4 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.6.0-rc.1
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 136.0.0
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.6.0
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 137.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.6.0-rc.1"
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "136.0.0"
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.6.0"
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "137.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", "~> 136.0.0"
+  s.dependency "MapboxNavigationNative", "~> 137.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": "a2da00dbce18713b6533a85504ddb940df082478",
-          "version": "23.6.0-rc.1"
+          "revision": "584006ae5dcd08ba5ce206c3363bd679600ed39c",
+          "version": "23.6.0"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "d6918f8c1ef527afbc358a62ca4d5080eb33c5d4",
-          "version": "10.14.0-rc.1"
+          "revision": "4ba4f85e4b6d71134a32a46d0bc05b7395dc96c0",
+          "version": "10.14.0"
         }
       },
       {
@@ -60,17 +60,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "371730a52be52af5ed9143515f816889e1ffefb4",
-          "version": "10.14.0-rc.1"
+          "revision": "e3c48af54e28c3fe1eeb7790dd6e26f65a86898d",
+          "version": "10.14.0"
         }
       },
       {
         "package": "MapboxNavigationNative",
         "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
         "state": {
           "branch": null,
-          "revision": "ff11ecf5651a4fdd9144d96671fc6a22637c2049",
-          "version": "136.0.0"
+          "revision": "d71a6000e41298afc61cebabf2f5d68d1151d322",
+          "version": "137.1.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.14.0-rc.1"
+  s.dependency "MapboxMaps", "10.14.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
@@ -6,35 +6,35 @@
         "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
         "state": {
           "branch": null,
-          "revision": "35f9e770f54ce62dd8526470f14c6e137cef3eea",
-          "version": "2.1.1"
+          "revision": "3b123999de19bf04905bc1dfdb76f817b0f2cc00",
+          "version": "2.1.2"
         }
       },
       {
         "package": "CwlPreconditionTesting",
         "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
         "state": {
           "branch": null,
-          "revision": "c21f7bab5ca8eee0a9998bbd17ca1d0eb45d4688",
-          "version": "2.1.0"
+          "revision": "a23ded2c91df9156628a6996ab4f347526f17b6b",
+          "version": "2.1.2"
         }
       },
       {
         "package": "MapboxCommon",
         "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
         "state": {
           "branch": null,
-          "revision": "a2da00dbce18713b6533a85504ddb940df082478",
-          "version": "23.6.0-rc.1"
+          "revision": "584006ae5dcd08ba5ce206c3363bd679600ed39c",
+          "version": "23.6.0"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "d6918f8c1ef527afbc358a62ca4d5080eb33c5d4",
-          "version": "10.14.0-rc.1"
+          "revision": "4ba4f85e4b6d71134a32a46d0bc05b7395dc96c0",
+          "version": "10.14.0"
         }
       },
       {
@@ -60,17 +60,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "371730a52be52af5ed9143515f816889e1ffefb4",
-          "version": "10.14.0-rc.1"
+          "revision": "e3c48af54e28c3fe1eeb7790dd6e26f65a86898d",
+          "version": "10.14.0"
         }
       },
       {
         "package": "MapboxNavigationNative",
         "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
         "state": {
           "branch": null,
-          "revision": "ff11ecf5651a4fdd9144d96671fc6a22637c2049",
-          "version": "136.0.0"
+          "revision": "972d8117e5a4ced65acf04c7239a4f1d8d5ddcc5",
+          "version": "137.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: "136.0.0"),
-        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.14.0-rc.1")),
+        .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "137.0.0"),
+        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.14.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/MapboxCoreNavigation/MapboxRoutingProvider.swift b/Sources/MapboxCoreNavigation/MapboxRoutingProvider.swift
@@ -172,7 +172,8 @@ public class MapboxRoutingProvider: RoutingProvider {
     }
 
     private func parseResponse<ResponseType: Codable>(
-        requestId: RequestId, userInfo: [CodingUserInfoKey : Any],
+        requestId: RequestId,
+        userInfo: [CodingUserInfoKey : Any],
         result: Expected<NSString, MapboxNavigationNative.RouterError>,
         completion: @escaping (Result<ResponseType, DirectionsError>) -> Void
     ) {
@@ -192,7 +193,8 @@ public class MapboxRoutingProvider: RoutingProvider {
     }
 
     private func parseResponse<ResponseType: Codable>(
-        requestId: RequestId, userInfo: [CodingUserInfoKey : Any],
+        requestId: RequestId,
+        userInfo: [CodingUserInfoKey : Any],
         result data: Data,
         error: Error?,
         completion: @escaping (Result<ResponseType, DirectionsError>) -> Void
@@ -384,9 +386,9 @@ public class MapboxRoutingProvider: RoutingProvider {
         guard case let .route(routeOptions) = indexedRouteResponse.routeResponse.options else {
             preconditionFailure("Invalid route data passed for refreshing. Expected `RouteResponse` containing `.route` `ResponseOptions` but got `.match`.")
         }
-        
-        let session = (options: routeOptions as DirectionsOptions,
-                       credentials: self.settings.directions.credentials)
+
+        let credentials = settings.directions.credentials
+        let session = (options: routeOptions as DirectionsOptions, credentials: credentials)
 
         guard let responseIdentifier = indexedRouteResponse.routeResponse.identifier else {
             DispatchQueue.main.async {
@@ -402,6 +404,8 @@ public class MapboxRoutingProvider: RoutingProvider {
                                                  routeIndex: routeIndex,
                                                  legIndex: startLegIndex,
                                                  routingProfile: routeOptions.profileIdentifier.nativeProfile,
+                                                 baseURL: credentials.host.absoluteString,
+                                                 token: credentials.accessToken ?? "",
                                                  currentRouteGeometryIndex: currentRouteShapeIndex.map { NSNumber(value: $0) },
                                                  additionalParams: [:])
 

diff --git a/Tests/CocoaPodsTest/PodInstall/Podfile.lock b/Tests/CocoaPodsTest/PodInstall/Podfile.lock
@@ -1,28 +1,28 @@
 PODS:
-  - MapboxCommon (23.6.0-rc.1)
-  - MapboxCoreMaps (10.14.0-rc.1):
-    - MapboxCommon (~> 23.6.0-rc)
-  - MapboxCoreNavigation (2.14.0-rc.1):
+  - MapboxCommon (23.6.0)
+  - MapboxCoreMaps (10.14.0):
+    - MapboxCommon (~> 23.6)
+  - MapboxCoreNavigation (2.14.0-beta.1):
     - MapboxDirections (~> 2.10.0)
     - MapboxMobileEvents (~> 1.0)
-    - MapboxNavigationNative (~> 136.0.0)
+    - MapboxNavigationNative (~> 137.0.0)
   - MapboxDirections (2.10.0):
     - Polyline (~> 5.0)
     - Turf (~> 2.6.1)
-  - MapboxMaps (10.14.0-rc.1):
-    - MapboxCommon (= 23.6.0-rc.1)
-    - MapboxCoreMaps (= 10.14.0-rc.1)
+  - MapboxMaps (10.14.0):
+    - MapboxCommon (= 23.6.0)
+    - MapboxCoreMaps (= 10.14.0)
     - MapboxMobileEvents (= 1.0.10)
     - Turf (~> 2.0)
   - MapboxMobileEvents (1.0.10)
-  - MapboxNavigation (2.14.0-rc.1):
-    - MapboxCoreNavigation (= 2.14.0-rc.1)
-    - MapboxMaps (= 10.14.0-rc.1)
+  - MapboxNavigation (2.14.0-beta.1):
+    - MapboxCoreNavigation (= 2.14.0-beta.1)
+    - MapboxMaps (= 10.14.0)
     - MapboxMobileEvents (~> 1.0)
     - MapboxSpeech (~> 2.0)
     - Solar-dev (~> 3.0)
-  - MapboxNavigationNative (136.0.1):
-    - MapboxCommon (~> 23.6.0-rc.1)
+  - MapboxNavigationNative (137.0.0):
+    - MapboxCommon (~> 23.6)
   - MapboxSpeech (2.1.1)
   - Polyline (5.1.0)
   - Solar-dev (3.0.1)
@@ -52,14 +52,14 @@ EXTERNAL SOURCES:
     :path: "../../../"
 
 SPEC CHECKSUMS:
-  MapboxCommon: 1bed7498396b2471365136f9ccb2cbc76a5bdc3f
-  MapboxCoreMaps: 317efac0776b3ccc8835497b90652da37dae8e4d
-  MapboxCoreNavigation: 10f2af869b5c18eb18baa32a94ada6969cf774a3
+  MapboxCommon: 4a0251dd470ee37e7fadda8e285c01921a5e1eb0
+  MapboxCoreMaps: eb07203bbb0b1509395db5ab89cd3ad6c2e3c04c
+  MapboxCoreNavigation: 6b3fffc8fe22a46896c2c3a2b6e1b021cf207842
   MapboxDirections: a620d78a54312c392323ba211df8ae7dd9a28ab4
-  MapboxMaps: c52d557e70550f629b156d307ad352f834daf08f
+  MapboxMaps: af50ec61a7eb3b032c3f7962c6bd671d93d2a209
   MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
-  MapboxNavigation: ebab3800e7bf512cce967a0d688e115fe77aaecd
-  MapboxNavigationNative: 87f56b099299e3ef366ebfe11aaa076ee7b14ff4
+  MapboxNavigation: bf21a38cd72ea182b0960ee63aab302d388d8405
+  MapboxNavigationNative: 904a6cc4a4bfe052b21fd1b8c529a9409a209098
   MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77
   Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
   Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0

diff --git a/Tests/MapboxCoreNavigationIntegrationTests/NativeTelemetryIntegrationTests.swift b/Tests/MapboxCoreNavigationIntegrationTests/NativeTelemetryIntegrationTests.swift
@@ -195,8 +195,9 @@ class NativeTelemetryIntegrationTests: TestCase {
 
         wait(for: [telemetryObserver.expectation, navigationFinished], timeout: expectationsTimeout)
     }
-
-    func testStartFreeRideAfterActiveNavigation() {
+
+    // Tracking issue: NAVIOS-1240
+    func disabled_testStartFreeRideAfterActiveNavigation() {
         let firstLocation = locationManager.locations.first!
         telemetryObserver.expectedEvents = [
             freeDriveEvent(eventType: "start", coordinate: firstLocation.coordinate)

diff --git a/Tests/MapboxCoreNavigationIntegrationTests/RouteControllerIntegrationTests.swift b/Tests/MapboxCoreNavigationIntegrationTests/RouteControllerIntegrationTests.swift
@@ -335,14 +335,13 @@ class RouteControllerIntegrationTests: TestCase {
         let routeOptions = indexedRouteResponse.validatedRouteOptions
         let encoder = JSONEncoder()
         encoder.userInfo[.options] = routeOptions
-        guard let routeData = try? encoder.encode(indexedRouteResponse.routeResponse),
-              let routeJSONString = String(data: routeData, encoding: .utf8) else {
-                  XCTFail()
-                  return
+        guard let routeData = try? encoder.encode(indexedRouteResponse.routeResponse) else {
+            XCTFail()
+            return
         }
         let routeRequest = Directions(credentials: indexedRouteResponse.routeResponse.credentials)
                                 .url(forCalculating: routeOptions).absoluteString
-        let parsedRoutes = RouteParser.parseDirectionsResponse(forResponse: routeJSONString,
+        let parsedRoutes = RouteParser.parseDirectionsResponse(forResponseDataRef: .init(data: routeData),
                                                                request: routeRequest,
                                                                routeOrigin: indexedRouteResponse.responseOrigin)
         let userInfo: [MapboxCoreNavigation.Navigator.NotificationUserInfoKey: Any] = [

diff --git a/Tests/MapboxCoreNavigationTests/NativeHandlersFactoryTests.swift b/Tests/MapboxCoreNavigationTests/NativeHandlersFactoryTests.swift
@@ -67,7 +67,7 @@ class NativeHandlersFactoryTests: TestCase {
             "features": [
                 "custom_feature_key": "custom_feature_value",
                 "useInternalReroute": true
-            ]
+            ] as [String : Any]
         ]
         _ = NativeHandlersFactory.configHandle(by: ConfigFactorySpy.self)
         let config = customConfig(from: ConfigFactorySpy.passedCustomConfig)