Dependency update for 2.16.0 release (#4543)

* Dependency update for 2.16.0 release
mapbox · Sep 14, 2023 · f45acf5 · f45acf5
1 parent 1de4051
commit f45acf5
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 62 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,9 +5,9 @@
 ### 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 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))
+* MapboxCoreNavigation now requires [MapboxDirections v2.11.1](https://github.com/mapbox/mapbox-directions-swift/releases/tag/v2.11.1). ([#4543](https://github.com/mapbox/mapbox-navigation-ios/pull/4543))
+* MapboxCoreNavigation now requires [MapboxNavigationNative v157._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/157.0.0). ([#4543](https://github.com/mapbox/mapbox-navigation-ios/pull/4543))
+* MapboxNavigation now requires [MapboxMaps v10.16.0](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.16.0). ([#4543](https://github.com/mapbox/mapbox-navigation-ios/pull/4543))
 
 ### Other changes
 

diff --git a/Cartfile b/Cartfile
@@ -1,4 +1,4 @@
-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
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.8.0
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 157.0.0
+github "mapbox/mapbox-directions-swift" ~> 2.11.1
 github "mapbox/mapbox-events-ios" ~> 1.0.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,6 +1,6 @@
-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"
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.8.0"
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "157.0.0"
+github "mapbox/mapbox-directions-swift" "v2.11.1"
 github "mapbox/mapbox-events-ios" "v1.0.10"
 github "mapbox/turf-swift" "v2.7.0"
 github "mattgallagher/CwlPreconditionTesting" "2.1.2"

diff --git a/MapboxCoreNavigation.podspec b/MapboxCoreNavigation.podspec
@@ -44,8 +44,8 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.module_name = "MapboxCoreNavigation"
 
-  s.dependency "MapboxNavigationNative", "~> 156.0.0"
-  s.dependency "MapboxDirections", "~> 2.11.0"
+  s.dependency "MapboxNavigationNative", "~> 157.0.0"
+  s.dependency "MapboxDirections", "~> 2.11.1"
   s.dependency "MapboxMobileEvents", "~> 1.0"
 
   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
@@ -24,26 +24,26 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
         "state": {
           "branch": null,
-          "revision": "914d9e9c258e036b6758c4b4cf8ef39bc5058f48",
-          "version": "23.8.0-rc.2"
+          "revision": "419bbceb7016eb6f8ca9f575d45508d9d948af30",
+          "version": "23.8.0"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "c1e3b2d777ab02fcbee43aeaa04398cb7582b0c5",
-          "version": "10.16.0-rc.2"
+          "revision": "d47a6e081b9ae736003033b971bfa641e650e08e",
+          "version": "10.16.0"
         }
       },
       {
         "package": "MapboxDirections",
         "repositoryURL": "https://github.com/mapbox/mapbox-directions-swift.git",
         "state": {
           "branch": null,
-          "revision": "040dcdf5396714788035ce93569a98d109373a97",
-          "version": "2.11.0"
+          "revision": "3aaab4fb516638c51ec8a2e73cd2fabdb4588622",
+          "version": "2.11.1"
         }
       },
       {
@@ -60,17 +60,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "f6fd82d06d835c42649c1d69e9a4c50d3f8d951b",
-          "version": "10.16.0-rc.1"
+          "revision": "41c6ed63c77100371a54f5bf74cfffd3fc9f57fa",
+          "version": "10.16.0"
         }
       },
       {
         "package": "MapboxNavigationNative",
         "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
         "state": {
           "branch": null,
-          "revision": "dbdc28cd91cace0b419bc05445835cb7570e90dd",
-          "version": "156.0.0"
+          "revision": "28c54bb4002ca16d60004c1abad2850240a4d149",
+          "version": "157.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.16.0-rc.1"
+  s.dependency "MapboxMaps", "~> 10.16.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,26 +24,26 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
         "state": {
           "branch": null,
-          "revision": "914d9e9c258e036b6758c4b4cf8ef39bc5058f48",
-          "version": "23.8.0-rc.2"
+          "revision": "419bbceb7016eb6f8ca9f575d45508d9d948af30",
+          "version": "23.8.0"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "c1e3b2d777ab02fcbee43aeaa04398cb7582b0c5",
-          "version": "10.16.0-rc.2"
+          "revision": "d47a6e081b9ae736003033b971bfa641e650e08e",
+          "version": "10.16.0"
         }
       },
       {
         "package": "MapboxDirections",
         "repositoryURL": "https://github.com/mapbox/mapbox-directions-swift.git",
         "state": {
           "branch": null,
-          "revision": "040dcdf5396714788035ce93569a98d109373a97",
-          "version": "2.11.0"
+          "revision": "3aaab4fb516638c51ec8a2e73cd2fabdb4588622",
+          "version": "2.11.1"
         }
       },
       {
@@ -60,17 +60,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "f6fd82d06d835c42649c1d69e9a4c50d3f8d951b",
-          "version": "10.16.0-rc.1"
+          "revision": "41c6ed63c77100371a54f5bf74cfffd3fc9f57fa",
+          "version": "10.16.0"
         }
       },
       {
         "package": "MapboxNavigationNative",
         "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
         "state": {
           "branch": null,
-          "revision": "dbdc28cd91cace0b419bc05445835cb7570e90dd",
-          "version": "156.0.0"
+          "revision": "28c54bb4002ca16d60004c1abad2850240a4d149",
+          "version": "157.0.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -22,10 +22,10 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.11.0"),
+        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.11.1"),
         .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: "156.0.0"),
-        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.16.0-rc.1"),
+        .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "157.0.0"),
+        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.16.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/Tests/CocoaPodsTest/PodInstall/Podfile.lock b/Tests/CocoaPodsTest/PodInstall/Podfile.lock
@@ -1,28 +1,28 @@
 PODS:
-  - MapboxCommon (23.8.0-rc.2)
-  - MapboxCoreMaps (10.16.0-rc.2):
-    - MapboxCommon (~> 23.8.0-rc)
+  - MapboxCommon (23.8.0)
+  - MapboxCoreMaps (10.16.0):
+    - MapboxCommon (~> 23.8)
   - MapboxCoreNavigation (2.16.0-beta.1):
-    - MapboxDirections (~> 2.11.0)
+    - MapboxDirections (~> 2.11.1)
     - MapboxMobileEvents (~> 1.0)
-    - MapboxNavigationNative (~> 156.0.0)
-  - MapboxDirections (2.11.0):
+    - MapboxNavigationNative (~> 157.0.0)
+  - MapboxDirections (2.11.1):
     - Polyline (~> 5.0)
     - Turf (~> 2.6.1)
-  - MapboxMaps (10.16.0-rc.1):
-    - MapboxCommon (= 23.8.0-rc.2)
-    - MapboxCoreMaps (= 10.16.0-rc.2)
+  - MapboxMaps (10.16.0):
+    - MapboxCommon (= 23.8.0)
+    - MapboxCoreMaps (= 10.16.0)
     - 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-rc.1)
+    - MapboxMaps (~> 10.16.0)
     - MapboxMobileEvents (~> 1.0)
     - MapboxSpeech (~> 2.0)
     - Solar-dev (~> 3.0)
-  - MapboxNavigationNative (156.0.0):
-    - MapboxCommon (~> 23.8.0-rc.2)
+  - MapboxNavigationNative (157.0.0):
+    - MapboxCommon (~> 23.8)
   - MapboxSpeech (2.1.1)
   - Polyline (5.1.0)
   - Solar-dev (3.0.1)
@@ -52,14 +52,14 @@ EXTERNAL SOURCES:
     :path: "../../../"
 
 SPEC CHECKSUMS:
-  MapboxCommon: 8912693b525746e78162bdfb8248c3ac0596d6a6
-  MapboxCoreMaps: 1ebfc8b21881d14aecf47d6bbf96921878aa1f1a
-  MapboxCoreNavigation: d39722ba7a78e2dfdf70e30ca7cc2dbeaa656d23
-  MapboxDirections: 0a1bd2321a4cb69f6ce19583848a0bc4bb89952b
-  MapboxMaps: aee3fab82e71f9acbbcff0568abc4a5e579d9b66
+  MapboxCommon: 8592a003eae487508461d452d62cfc5906a9682a
+  MapboxCoreMaps: faa14a797417dc32088c98019a3ce72e46cda5cd
+  MapboxCoreNavigation: 9b2f0b050f69bfeda967207cd281f0f776364d72
+  MapboxDirections: 31d61b8369d5dde6f6828f72905ab9a7e054cd2c
+  MapboxMaps: f10aecadbfb7cf96368852ca313101eb4171da53
   MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
-  MapboxNavigation: bd489bcc40cf93f56461f6bcfaa6e61222e1805c
-  MapboxNavigationNative: 5469a6ba76a373bc52247afd23281a6d761ded3c
+  MapboxNavigation: e1bc2c1ec214075ce64a1e04e9fe6170509f23e9
+  MapboxNavigationNative: 2953310e4e05fcc3b335bdbeee861347272ac38f
   MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77
   Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
   Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0

diff --git a/Tests/MapboxCoreNavigationIntegrationTests/NativeTelemetryIntegrationTests.swift b/Tests/MapboxCoreNavigationIntegrationTests/NativeTelemetryIntegrationTests.swift
@@ -64,8 +64,8 @@ class NativeTelemetryIntegrationTests: TestCase {
         let routesData = json?["routes"] as? [[String: Any]]
         let geometryRawValue = (routesData?[0]["geometry"] as? String)?
             .trimmingCharacters(in: .whitespacesAndNewlines)
-            .replacingOccurrences(of: "\\", with: "\\\\") ?? ""
-        geometry = "\"" + geometryRawValue + "\""
+            .trimmingCharacters(in: .init(charactersIn: "\"")) ?? ""
+        geometry = geometryRawValue
         route = routeResponse.routes!.first!
         indexedRouteResponse = IndexedRouteResponse(routeResponse: routeResponse, routeIndex: 0)
         alternateRouteResponse = Fixture.routeResponse(from: jsonFileName, options: routeOptions)
@@ -195,7 +195,7 @@ class NativeTelemetryIntegrationTests: TestCase {
 
         wait(for: [telemetryObserver.expectation, navigationFinished], timeout: expectationsTimeout)
     }
-    
+
     // Tracking issue: NAVIOS-1240
     func disabled_testStartFreeRideAfterActiveNavigation() {
         let firstLocation = locationManager.locations.first!
@@ -359,8 +359,6 @@ class NativeTelemetryIntegrationTests: TestCase {
             "originalRequestIdentifier",
             "requestIdentifier",
             "connectivity",
-            "distanceRemaining",
-            "durationRemaining",
             // TODO: fix flaky check of voiceIndex & bannerIndex
             "voiceIndex",
             "bannerIndex"
@@ -482,9 +480,8 @@ class NativeTelemetryIntegrationTests: TestCase {
         let approximateValueCheckAttributes = [
             "absoluteDistanceToDestination": (location.distance(from: CLLocation(latitude: lastCoordinate.latitude, longitude: lastCoordinate.longitude)), 10.0),
             "distanceCompleted": (routeProgress.distanceTraveled, 10.0),
-            // TODO: return value check after NN fix
-//            "distanceRemaining": (routeProgress.distanceRemaining, 10.0),
-//            "durationRemaining": (routeProgress.durationRemaining, 1.0),
+            "distanceRemaining": (routeProgress.distanceRemaining, 10.0),
+            "durationRemaining": (routeProgress.durationRemaining, 1.0),
         ]
         let attributesKeys = noValueCheckAttributesKeys ?? activeNoValueCheckAttributesKeys
         return event(with: eventName,