Update dependencies for v2.13.0 GA

mapbox · May 12, 2023 · 3702df9 · 3702df9
1 parent 9d0c0c7
commit 3702df9
Show file tree

Hide file tree

Showing 15 changed files with 106 additions and 64 deletions.
diff --git a/.base_api b/.base_api
@@ -1 +1 @@
-9715c229ea4447894cb1860ca829eacb4d5f4a05
+5ae9a58f974ce833165e5100f938919260f6de30
diff --git a/.breakage-allowlist b/.breakage-allowlist
@@ -1 +0,0 @@
-EnumElement RoadObject.Kind.notification has been added as a new enum case

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,9 @@
 
 ### Packaging
 
-* MapboxCoreNavigation now requires [MapboxNavigationNative v132._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/132.0.0). ([#4437](https://github.com/mapbox/mapbox-navigation-ios/pull/4437))
-* MapboxNavigation now requires [MapboxMaps v10.13.0-rc.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.13.0-rc.1). ([#4437](https://github.com/mapbox/mapbox-navigation-ios/pull/4437))
+* MapboxCoreNavigation now requires [MapboxNavigationNative v132.2.0](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/132.2.0). ([#4437](https://github.com/mapbox/mapbox-navigation-ios/pull/4437))
+* MapboxNavigation now requires [MapboxMaps v10.13.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.13.1). ([#4437](https://github.com/mapbox/mapbox-navigation-ios/pull/4437))
+* MapboxCoreNavigation now requires [MapboxDirections v2.10.0](https://github.com/mapbox/mapbox-directions-swift/releases/tag/v2.10.0). ([#4417](https://github.com/mapbox/mapbox-navigation-ios/pull/4417))
 
 ### Map
 

diff --git a/Cartfile b/Cartfile
@@ -1,4 +1,4 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.5.0-rc.1
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 132.0.0
-github "mapbox/mapbox-directions-swift" == 2.11.0-rc.1
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" ~> 23.5.0
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 132.2.0
+github "mapbox/mapbox-directions" ~> 2.10.0
 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.5.0-rc.1"
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "132.0.0"
-github "mapbox/mapbox-directions-swift" "v2.11.0-rc.1"
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.5.0"
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "132.2.0"
+github "mapbox/mapbox-directions-swift" "v2.10.0"
 github "mapbox/mapbox-events-ios" "v1.0.10"
 github "mapbox/turf-swift" "v2.6.1"
 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", "~> 132.0.0"
-  s.dependency "MapboxDirections-pre", "2.11.0-rc.1"
+  s.dependency "MapboxNavigationNative", "~> 132.2.0"
+  s.dependency "MapboxDirections", "~> 2.10.0"
   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": "d7b7954665a84a44a83877886c5c92b2d19c82db",
-          "version": "23.5.0-rc.1"
+          "revision": "a623ae13560c81085d2c63807143c83f46e69f2f",
+          "version": "23.5.0"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "10ac9df99b62b74c3929d129c96d8a55c5f1e7fc",
-          "version": "10.13.0-rc.1"
+          "revision": "cabf9a5c77f7a2582a14049ca295fef5ca439e71",
+          "version": "10.13.1"
         }
       },
       {
         "package": "MapboxDirections",
         "repositoryURL": "https://github.com/mapbox/mapbox-directions-swift.git",
         "state": {
           "branch": null,
-          "revision": "1061623d294c47657e029f1105c3c3aa44ca1f8a",
-          "version": "2.11.0-rc.1"
+          "revision": "edcc5b30009e784f17c1cced1075878eaf781187",
+          "version": "2.10.0"
         }
       },
       {
@@ -60,17 +60,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "d425e69456603fd1adda2027939dce3112d1659f",
-          "version": "10.13.0-rc.1"
+          "revision": "e3e502e0cf5c0f8759960455711bc9dad1cf393e",
+          "version": "10.13.1"
         }
       },
       {
         "package": "MapboxNavigationNative",
         "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
         "state": {
           "branch": null,
-          "revision": "f3a669e861b9a58fa18f7cf1e232da0acd8e2a81",
-          "version": "132.0.0"
+          "revision": "df47d24b291302ee9b072510d646e7291207699b",
+          "version": "132.2.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.13.0-rc.1"
+  s.dependency "MapboxMaps", "~> 10.13.1"
   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": "96221b5892f97450cb799d3bf1d7624e0a696e7b",
-          "version": "23.5.0-beta.1"
+          "revision": "a623ae13560c81085d2c63807143c83f46e69f2f",
+          "version": "23.5.0"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "3fadce6b50452676869ebb655d1d0aafe7232fd6",
-          "version": "10.13.0-beta.1"
+          "revision": "cabf9a5c77f7a2582a14049ca295fef5ca439e71",
+          "version": "10.13.1"
         }
       },
       {
         "package": "MapboxDirections",
         "repositoryURL": "https://github.com/mapbox/mapbox-directions-swift.git",
         "state": {
           "branch": null,
-          "revision": "1061623d294c47657e029f1105c3c3aa44ca1f8a",
-          "version": "2.11.0-rc.1"
+          "revision": "edcc5b30009e784f17c1cced1075878eaf781187",
+          "version": "2.10.0"
         }
       },
       {
@@ -60,17 +60,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "e8cf9192539359d2c03bd82f9d0761d3ca3d78fc",
-          "version": "10.13.0-beta.1"
+          "revision": "e3e502e0cf5c0f8759960455711bc9dad1cf393e",
+          "version": "10.13.1"
         }
       },
       {
         "package": "MapboxNavigationNative",
         "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
         "state": {
           "branch": null,
-          "revision": "cf9cab5dc3b9e6cfb69a513956f77fc8b4a110ca",
-          "version": "131.0.0"
+          "revision": "df47d24b291302ee9b072510d646e7291207699b",
+          "version": "132.2.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -22,15 +22,51 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.11.0-rc.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: "132.0.0"),
-        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.13.0-rc.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"),
-        .package(name: "SnapshotTesting", url: "https://github.com/pointfreeco/swift-snapshot-testing.git", .exact("1.9.0")),
-        .package(name: "OHHTTPStubs", url: "https://github.com/AliSoftware/OHHTTPStubs.git", from: "9.1.0"),
+        .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: "132.2.0"
+        ),
+        .package(
+            name: "MapboxMaps",
+            url: "https://github.com/mapbox/mapbox-maps-ios.git",
+            from: "10.13.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"
+        ),
+        .package(
+            name: "SnapshotTesting",
+            url: "https://github.com/pointfreeco/swift-snapshot-testing.git",
+            .exact("1.9.0")
+        ),
+        .package(
+            name: "OHHTTPStubs",
+            url: "https://github.com/AliSoftware/OHHTTPStubs.git",
+            from: "9.1.0"
+        ),
     ],
     targets: [
         .target(

diff --git a/Sources/TestHelper/NavNative/TestNavigationStatusProvider.swift b/Sources/TestHelper/NavNative/TestNavigationStatusProvider.swift
@@ -46,6 +46,7 @@ public final class TestNavigationStatusProvider {
                      keyPoints: [],
                      mapMatcherOutput: mapMatcherOutput,
                      offRoadProba: 0,
+                     offRoadStateProvider: .unknown,
                      activeGuidanceInfo: activeGuidanceInfo,
                      upcomingRouteAlerts: [],
                      upcomingRouteAlertUpdates: upcomingRouteAlertUpdates,

diff --git a/Tests/CocoaPodsTest/PodInstall/PodInstall.xcodeproj/project.pbxproj b/Tests/CocoaPodsTest/PodInstall/PodInstall.xcodeproj/project.pbxproj
@@ -232,7 +232,7 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-PodInstall/Pods-PodInstall-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/MapboxCoreNavigation/MapboxCoreNavigation.framework",
-				"${BUILT_PRODUCTS_DIR}/MapboxDirections-pre/MapboxDirections.framework",
+				"${BUILT_PRODUCTS_DIR}/MapboxDirections/MapboxDirections.framework",
 				"${BUILT_PRODUCTS_DIR}/MapboxMaps/MapboxMaps.framework",
 				"${BUILT_PRODUCTS_DIR}/MapboxNavigation/MapboxNavigation.framework",
 				"${BUILT_PRODUCTS_DIR}/MapboxSpeech/MapboxSpeech.framework",

diff --git a/Tests/CocoaPodsTest/PodInstall/Podfile.lock b/Tests/CocoaPodsTest/PodInstall/Podfile.lock
@@ -1,28 +1,28 @@
 PODS:
-  - MapboxCommon (23.5.0-rc.1)
-  - MapboxCoreMaps (10.13.0-rc.1):
-    - MapboxCommon (~> 23.5.0-rc)
+  - MapboxCommon (23.5.0)
+  - MapboxCoreMaps (10.13.1):
+    - MapboxCommon (~> 23.5)
   - MapboxCoreNavigation (2.13.0-rc.1):
-    - MapboxDirections-pre (= 2.11.0-rc.1)
+    - MapboxDirections (~> 2.10.0)
     - MapboxMobileEvents (~> 1.0)
-    - MapboxNavigationNative (~> 132.0.0)
-  - MapboxDirections-pre (2.11.0-rc.1):
+    - MapboxNavigationNative (~> 132.2.0)
+  - MapboxDirections (2.10.0):
     - Polyline (~> 5.0)
     - Turf (~> 2.6.1)
-  - MapboxMaps (10.13.0-rc.1):
-    - MapboxCommon (= 23.5.0-rc.1)
-    - MapboxCoreMaps (= 10.13.0-rc.1)
+  - MapboxMaps (10.13.1):
+    - MapboxCommon (= 23.5.0)
+    - MapboxCoreMaps (= 10.13.1)
     - MapboxMobileEvents (= 1.0.10)
     - Turf (~> 2.0)
   - MapboxMobileEvents (1.0.10)
   - MapboxNavigation (2.13.0-rc.1):
     - MapboxCoreNavigation (= 2.13.0-rc.1)
-    - MapboxMaps (= 10.13.0-rc.1)
+    - MapboxMaps (~> 10.13.1)
     - MapboxMobileEvents (~> 1.0)
     - MapboxSpeech (~> 2.0)
     - Solar-dev (~> 3.0)
-  - MapboxNavigationNative (132.0.0):
-    - MapboxCommon (~> 23.5.0-rc.1)
+  - MapboxNavigationNative (132.2.0):
+    - MapboxCommon (~> 23.5)
   - MapboxSpeech (2.1.1)
   - Polyline (5.1.0)
   - Solar-dev (3.0.1)
@@ -36,7 +36,7 @@ SPEC REPOS:
   trunk:
     - MapboxCommon
     - MapboxCoreMaps
-    - MapboxDirections-pre
+    - MapboxDirections
     - MapboxMaps
     - MapboxMobileEvents
     - MapboxNavigationNative
@@ -52,19 +52,19 @@ EXTERNAL SOURCES:
     :path: "../../../"
 
 SPEC CHECKSUMS:
-  MapboxCommon: 7c645749bf13a6d8a1f5419c3268c504481551b4
-  MapboxCoreMaps: 92d89d20131bbaf2f22d7bf71cbdd7188fb0c595
-  MapboxCoreNavigation: c48cdf911964e00b05770d7e9494a7145ac72db2
-  MapboxDirections-pre: 0cc87359ada104780eeefc4fb6e97770b73c0f7a
-  MapboxMaps: 67376dc61896a4e3002708e50db45a34054a22bf
+  MapboxCommon: fdf7fd31c90b7b607cd9c63e37797f023c01d860
+  MapboxCoreMaps: 24270c7c6b8cb71819fc2f3c549db9620ee4d019
+  MapboxCoreNavigation: a913720fed7e49c6e8f13b2c936eb31eb09a0030
+  MapboxDirections: a620d78a54312c392323ba211df8ae7dd9a28ab4
+  MapboxMaps: cb76511b98d3b95c74b0771ed105bc69f30ace6b
   MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
-  MapboxNavigation: d9aaaca634adba8a5b84110728fde2b6896a328b
-  MapboxNavigationNative: 6a74861ea0caae4740b9646d1480c73db46e029f
+  MapboxNavigation: 2624aaeef1de24666e9c6b48f72b1d711d3cbab0
+  MapboxNavigationNative: af56f3e44a30602fe347c756e5a6efcfdaf3e7fb
   MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77
   Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
   Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0
   Turf: 469ce2c3d22e5e8e4818d5a3b254699a5c89efa4
 
 PODFILE CHECKSUM: 20f356205cc7a366d6b3c177155b683e2d62b354
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0
diff --git a/Tests/MapboxCoreNavigationIntegrationTests/RouteControllerIntegrationTests.swift b/Tests/MapboxCoreNavigationIntegrationTests/RouteControllerIntegrationTests.swift
@@ -490,6 +490,10 @@ extension MapboxCoreNavigation.RoadObject.Kind {
             return .ic
         case .jct:
             return .jct
+        case .notification:
+            return .notification
+        @unknown default:
+            fatalError("Unknown MapboxNavigationNative.RoadObjectType value.")
         }
     }
 }

diff --git a/Tests/MapboxCoreNavigationTests/Progress/RouteProgressTests.swift b/Tests/MapboxCoreNavigationTests/Progress/RouteProgressTests.swift
@@ -335,6 +335,7 @@ class RouteProgressTests: TestCase {
                 keyPoints: [],
                 mapMatcherOutput: .init(matches: [], isTeleport: false),
                 offRoadProba: 0,
+                offRoadStateProvider: .unknown,
                 activeGuidanceInfo: .init(
                     routeProgress: .init(distanceTraveled: 0, fractionTraveled: 0, remainingDistance: 0, remainingDuration: 0),
                     legProgress: .init(distanceTraveled: 0, fractionTraveled: 0, remainingDistance: 0, remainingDuration: 0),