Dependencies update (#4605)

* vk/dependencies-update: bumped Directions to 2.12.0, Maps to 10.16.5. Now compatible with Turf 2.7.0.; bumped NN to v202; update cocoapods in gemfile to 1.14; CHANGELOG updated
mapbox · Mar 4, 2024 · fe4bbd4 · fe4bbd4
1 parent 2463f19
commit fe4bbd4
Show file tree

Hide file tree

Showing 12 changed files with 86 additions and 70 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,9 @@
 
 ### Packaging
 
-* MapboxNavigation now requires [MapboxMaps v10.16.4](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.16.4). ([#4585](https://github.com/mapbox/mapbox-navigation-ios/pull/4585))
-* MapboxCoreNavigation now requires [MapboxNavigationNative v182._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/182.0.0). ([#4585](https://github.com/mapbox/mapbox-navigation-ios/pull/4585))
+* MapboxNavigation now requires [MapboxMaps v10.16.5](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.16.5). ([#4605](https://github.com/mapbox/mapbox-navigation-ios/pull/4605))
+* MapboxCoreNavigation now requires [MapboxDirections v2.12.0](https://github.com/mapbox/mapbox-directions-swift/releases/tag/v2.12.0). ([#4605](https://github.com/mapbox/mapbox-navigation-ios/pull/4605))
+* MapboxCoreNavigation now requires [MapboxNavigationNative v202._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/202.0.0). ([#4605](https://github.com/mapbox/mapbox-navigation-ios/pull/4605))
 * MapboxCoreNavigation is no longer dependent on MapboxMobileEvents. ([#4572](https://github.com/mapbox/mapbox-navigation-ios/pull/4572))
 * Added a Polish localization. ([#4582](https://github.com/mapbox/mapbox-navigation-ios/pull/4582))
 

diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
 binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.8.6
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 182.0.0
-github "mapbox/mapbox-directions-swift" ~> 2.11.1
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 202.0.0
+github "mapbox/mapbox-directions-swift" ~> 2.12.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,7 +1,7 @@
 binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.8.6"
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "182.0.0"
-github "mapbox/mapbox-directions-swift" "v2.11.1"
-github "mapbox/turf-swift" "v2.7.0"
-github "mattgallagher/CwlPreconditionTesting" "2.1.2"
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "202.0.0"
+github "mapbox/mapbox-directions-swift" "v2.12.0"
+github "mapbox/turf-swift" "v2.8.0"
+github "mattgallagher/CwlPreconditionTesting" "2.2.1"
 github "pointfreeco/swift-snapshot-testing" "1.9.0"
 github "raphaelmor/Polyline" "v5.1.0"
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 gem 'fastlane'
 gem 'snapshot'
-gem 'cocoapods', '~> 1.10'
+gem 'cocoapods', '~> 1.14'
 gem 'jazzy', '~> 0.14'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,14 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (7.0.6)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.4)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
@@ -32,13 +39,15 @@ GEM
     aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     claide (1.1.0)
-    cocoapods (1.12.1)
+    cocoapods (1.15.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.12.1)
+      cocoapods-core (= 1.15.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.6.0, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -50,8 +59,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.12.1)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.15.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -62,7 +71,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.3)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -74,13 +83,15 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     declarative (0.0.20)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.8.1)
+    drb (2.2.1)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
@@ -154,7 +165,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    ffi (1.15.5)
+    ffi (1.16.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -213,22 +224,24 @@ GEM
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.1)
     jwt (2.7.0)
     liferaft (0.0.6)
     memoist (0.16.2)
     mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.1)
-    minitest (5.18.1)
+    minitest (5.22.2)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     mustache (1.1.1)
+    mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
+    nkf (0.2.0)
     open4 (1.3.4)
     optparse (0.1.1)
     os (1.1.4)
@@ -241,7 +254,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
@@ -273,7 +286,7 @@ GEM
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -286,7 +299,7 @@ GEM
     word_wrap (1.0.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.22.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -302,7 +315,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.10)
+  cocoapods (~> 1.14)
   fastlane
   jazzy (~> 0.14)
   snapshot

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", "~> 182.0.0"
-  s.dependency "MapboxDirections", "~> 2.11.1"
+  s.dependency "MapboxNavigationNative", "~> 202.0.0"
+  s.dependency "MapboxDirections", "~> 2.12.0"
 
   s.swift_version = "5.5"
 end
diff --git a/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -24,44 +24,44 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
         "state": {
           "branch": null,
-          "revision": "065cb97a83b8bf8d8584ab56cb6ebed898cc0c97",
-          "version": "23.8.6"
+          "revision": "ea67fe9b6ef4ee37e1d0bbc32752d46f3082dc61",
+          "version": "23.9.0"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "798644dafccc37c3be17127e39638f39d6cd57e3",
-          "version": "10.16.4"
+          "revision": "00207cff55938601b4ce22e683cdc710fd8864e9",
+          "version": "10.16.5"
         }
       },
       {
         "package": "MapboxDirections",
         "repositoryURL": "https://github.com/mapbox/mapbox-directions-swift.git",
         "state": {
           "branch": null,
-          "revision": "3aaab4fb516638c51ec8a2e73cd2fabdb4588622",
-          "version": "2.11.1"
+          "revision": "dffb8fd7c8316ae8d9b79b694be933deba6f544e",
+          "version": "2.12.0"
         }
       },
       {
         "package": "MapboxMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "05a275f685ac95982716d87ccb677ebad417c252",
-          "version": "10.16.4"
+          "revision": "79af3be38640c4d60af167e9ee42754d832816e3",
+          "version": "10.16.5"
         }
       },
       {
         "package": "MapboxNavigationNative",
         "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
         "state": {
           "branch": null,
-          "revision": "a8f1894703d5bf605979cfa81b6e0a43bcff53e9",
-          "version": "182.0.0"
+          "revision": "a40157f2b13108563a3b792d42c4fdcc2287cdcc",
+          "version": "202.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.4"
+  s.dependency "MapboxMaps", "~> 10.16.5"
   s.dependency "Solar-dev", "~> 3.0"
   s.dependency "MapboxSpeech", "~> 2.0"
 

diff --git a/Package.swift b/Package.swift
@@ -22,9 +22,9 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.11.1"),
-        .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "182.0.0"),
-        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.16.4"),
+        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.12.0"),
+        .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "202.0.0"),
+        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.16.5"),
         .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
@@ -24,7 +24,7 @@ public final class TestNavigationStatusProvider {
         let road = MapboxNavigationNative.RoadName(text: "name", language: "lang", imageBaseUrl: "base_image_url", shield: shield)
         let roadNames = roads ?? [road]
         let mapMatch = MapMatch(position: .init(edgeId: 0, percentAlong: 0), proba: 42)
-        let mapMatcherOutput = MapMatcherOutput(matches: [mapMatch], isTeleport: false)
+        let mapMatcherOutput = MapMatcherOutput(matches: [mapMatch], isTeleport: false, totalCandidatesCount: 1)
         return .init(routeState: routeState,
                      locatedAlternativeRouteId: nil,
                      primaryRouteId: nil,
@@ -54,6 +54,7 @@ public final class TestNavigationStatusProvider {
                      nextWaypointIndex: 0,
                      layer: nil,
                      isSyntheticLocation: false,
-                     correctedLocationData: nil)
+                     correctedLocationData: nil, 
+                     mapMatchedSystemTime: Date())
     }
 }
diff --git a/Tests/CocoaPodsTest/PodInstall/Podfile.lock b/Tests/CocoaPodsTest/PodInstall/Podfile.lock
@@ -1,30 +1,30 @@
 PODS:
-  - MapboxCommon (23.8.6)
-  - MapboxCoreMaps (10.16.4):
-    - MapboxCommon (~> 23.8)
+  - MapboxCommon (23.9.0)
+  - MapboxCoreMaps (10.16.5):
+    - MapboxCommon (~> 23.9)
   - MapboxCoreNavigation (2.18.0-rc.2):
-    - MapboxDirections (~> 2.11.1)
-    - MapboxNavigationNative (~> 182.0.0)
-  - MapboxDirections (2.11.1):
+    - MapboxDirections (~> 2.12.0)
+    - MapboxNavigationNative (~> 202.0.0)
+  - MapboxDirections (2.12.0):
     - Polyline (~> 5.0)
-    - Turf (~> 2.6.1)
-  - MapboxMaps (10.16.4):
-    - MapboxCommon (= 23.8.6)
-    - MapboxCoreMaps (= 10.16.4)
+    - Turf (~> 2.7.0)
+  - MapboxMaps (10.16.5):
+    - MapboxCommon (= 23.9.0)
+    - MapboxCoreMaps (= 10.16.5)
     - MapboxMobileEvents (= 1.0.10)
-    - Turf (~> 2.0)
+    - Turf (= 2.7.0)
   - MapboxMobileEvents (1.0.10)
   - MapboxNavigation (2.18.0-rc.2):
     - MapboxCoreNavigation (= 2.18.0-rc.2)
-    - MapboxMaps (~> 10.16.4)
+    - MapboxMaps (~> 10.16.5)
     - MapboxSpeech (~> 2.0)
     - Solar-dev (~> 3.0)
-  - MapboxNavigationNative (182.0.0):
-    - MapboxCommon (~> 23.8)
+  - MapboxNavigationNative (202.0.0):
+    - MapboxCommon (~> 23.9)
   - MapboxSpeech (2.1.1)
   - Polyline (5.1.0)
   - Solar-dev (3.0.1)
-  - Turf (2.6.1)
+  - Turf (2.7.0)
 
 DEPENDENCIES:
   - MapboxCoreNavigation (from `../../../`)
@@ -50,19 +50,19 @@ EXTERNAL SOURCES:
     :path: "../../../"
 
 SPEC CHECKSUMS:
-  MapboxCommon: 90f76693dc02438acbb5ea9a5b266a4c0eb1c875
-  MapboxCoreMaps: 7b07d1ca8c454a4381daf09df901b9d6bf90bce0
-  MapboxCoreNavigation: e23646326ca7ba8c87c3fd1d68eb852a2333692a
-  MapboxDirections: 31d61b8369d5dde6f6828f72905ab9a7e054cd2c
-  MapboxMaps: cbb38845a9bf49b124f0e937975d560a4e01894e
+  MapboxCommon: e89c490cccd7ea9efcdc0e74b4ce1dbd9b4a875a
+  MapboxCoreMaps: 920f194f4f8b37f5731e0bdb82296d96ac4276f5
+  MapboxCoreNavigation: bc5498a56c9e5c18ce9581ecc02ae47c1059e75e
+  MapboxDirections: 4676f626df320732dcf74612223e568d39588320
+  MapboxMaps: e8d94fb4782295df68172ce7ed567da8228c629e
   MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
-  MapboxNavigation: 816011674ed85b8a44bc0d7127a778195b8e3e50
-  MapboxNavigationNative: f2cbb7eddb712a541edb7f4c9ed286f02ede5c12
+  MapboxNavigation: d0cf913d77373f14bdc414953f8ac38e7a284f85
+  MapboxNavigationNative: 65bc7bdab133ee5c36a13c0d2b10d3c53e111073
   MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77
   Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
   Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0
-  Turf: 469ce2c3d22e5e8e4818d5a3b254699a5c89efa4
+  Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2
 
 PODFILE CHECKSUM: bde8103af0e9b326531ee57cf1fa935cbd5f2e18
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.14.3
diff --git a/Tests/MapboxCoreNavigationTests/Progress/RouteProgressTests.swift b/Tests/MapboxCoreNavigationTests/Progress/RouteProgressTests.swift
@@ -335,7 +335,7 @@ class RouteProgressTests: TestCase {
                 bannerInstruction: nil,
                 speedLimit: .init(speed: nil, localeUnit: .kilometresPerHour, localeSign: .vienna),
                 keyPoints: [],
-                mapMatcherOutput: .init(matches: [], isTeleport: false),
+                mapMatcherOutput: .init(matches: [], isTeleport: false, totalCandidatesCount: 0),
                 offRoadProba: 0,
                 offRoadStateProvider: .unknown,
                 activeGuidanceInfo: .init(
@@ -347,7 +347,8 @@ class RouteProgressTests: TestCase {
                 nextWaypointIndex: 0,
                 layer: nil,
                 isSyntheticLocation: false,
-                correctedLocationData: nil
+                correctedLocationData: nil, 
+                mapMatchedSystemTime: Date()
             )
         }