diff --git a/CHANGELOG.md b/CHANGELOG.md index a6bc2d075fc..e02bbde41dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v2.17.0 +### Packaging + +* MapboxCoreNavigation now requires [MapboxNavigationNative v158._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/158.0.0). ([#4550](https://github.com/mapbox/mapbox-navigation-ios/pull/4550)) + ### CarPlay * Fixed behavior when completion was not called in case of an error in CarPlayManager. ([#4548](https://github.com/mapbox/mapbox-navigation-ios/pull/4548)) diff --git a/Cartfile b/Cartfile index 6bcbfa3735d..007ccdc4fb3 100644 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,4 @@ 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 +binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 158.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 index 2acd7d93e4b..e21c8bb2298 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ 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" +binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "158.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" diff --git a/MapboxCoreNavigation.podspec b/MapboxCoreNavigation.podspec index b981b3b5c1e..20cd9475c3e 100644 --- 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", "~> 157.0.0" + s.dependency "MapboxNavigationNative", "~> 158.0.0" s.dependency "MapboxDirections", "~> 2.11.1" 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 index 260d1ec68be..e08c3859c59 100644 --- a/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -69,8 +69,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git", "state": { "branch": null, - "revision": "28c54bb4002ca16d60004c1abad2850240a4d149", - "version": "157.0.0" + "revision": "a90b05d31a1fda9f4d3079f1358bd711a7717ffb", + "version": "158.0.0" } }, { diff --git a/Package.swift b/Package.swift index a8f2110fd7b..59dcd09f157 100644 --- a/Package.swift +++ b/Package.swift @@ -24,7 +24,7 @@ let package = Package( dependencies: [ .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: "157.0.0"), + .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "158.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"), diff --git a/Sources/MapboxCoreNavigation/NativeHandlersFactory.swift b/Sources/MapboxCoreNavigation/NativeHandlersFactory.swift index cf38dc50354..84b3d449c17 100644 --- a/Sources/MapboxCoreNavigation/NativeHandlersFactory.swift +++ b/Sources/MapboxCoreNavigation/NativeHandlersFactory.swift @@ -93,8 +93,6 @@ class NativeHandlersFactory { tileStore: tileStore, inMemoryTileCache: nil, onDiskTileCache: nil, - mapMatchingSpatialCache: nil, - threadsCount: nil, endpointConfig: endpointConfig) }() diff --git a/Sources/TestHelper/CoreNavigatorSpy.swift b/Sources/TestHelper/CoreNavigatorSpy.swift index cdd2effca7c..8ad15b8a854 100644 --- a/Sources/TestHelper/CoreNavigatorSpy.swift +++ b/Sources/TestHelper/CoreNavigatorSpy.swift @@ -156,8 +156,6 @@ class GraphAccessorSpy: GraphAccessor { tileStore: nil, inMemoryTileCache: nil, onDiskTileCache: nil, - mapMatchingSpatialCache: nil, - threadsCount: nil, endpointConfig: nil) let cache = CacheFactory.build(for: tileConfig, config: configHandle, historyRecorder: nil) super.init(cache: cache) @@ -171,8 +169,6 @@ class RoadObjectMatcherSpy: MapboxNavigationNative.RoadObjectMatcher { tileStore: nil, inMemoryTileCache: nil, onDiskTileCache: nil, - mapMatchingSpatialCache: nil, - threadsCount: nil, endpointConfig: nil) let cache = CacheFactory.build(for: tileConfig, config: configHandle, historyRecorder: nil) super.init(cache: cache) diff --git a/Sources/TestHelper/NavNative/TestNavigationStatusProvider.swift b/Sources/TestHelper/NavNative/TestNavigationStatusProvider.swift index fe91c3cfccc..1b07440d2e1 100644 --- a/Sources/TestHelper/NavNative/TestNavigationStatusProvider.swift +++ b/Sources/TestHelper/NavNative/TestNavigationStatusProvider.swift @@ -53,6 +53,7 @@ public final class TestNavigationStatusProvider { upcomingRouteAlertUpdates: upcomingRouteAlertUpdates, nextWaypointIndex: 0, layer: nil, - isSyntheticLocation: false) + isSyntheticLocation: false, + correctedLocationData: nil) } } diff --git a/Tests/CocoaPodsTest/PodInstall/Podfile.lock b/Tests/CocoaPodsTest/PodInstall/Podfile.lock index 6e991b3a182..c84d84e9f6c 100644 --- a/Tests/CocoaPodsTest/PodInstall/Podfile.lock +++ b/Tests/CocoaPodsTest/PodInstall/Podfile.lock @@ -5,7 +5,7 @@ PODS: - MapboxCoreNavigation (2.16.0): - MapboxDirections (~> 2.11.1) - MapboxMobileEvents (~> 1.0) - - MapboxNavigationNative (~> 157.0.0) + - MapboxNavigationNative (~> 158.0.0) - MapboxDirections (2.11.1): - Polyline (~> 5.0) - Turf (~> 2.6.1) @@ -21,7 +21,7 @@ PODS: - MapboxMobileEvents (~> 1.0) - MapboxSpeech (~> 2.0) - Solar-dev (~> 3.0) - - MapboxNavigationNative (157.0.0): + - MapboxNavigationNative (158.0.0): - MapboxCommon (~> 23.8) - MapboxSpeech (2.1.1) - Polyline (5.1.0) @@ -54,12 +54,12 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: MapboxCommon: 8592a003eae487508461d452d62cfc5906a9682a MapboxCoreMaps: faa14a797417dc32088c98019a3ce72e46cda5cd - MapboxCoreNavigation: 9414a9ba6681070f1186cca16c14d65d5663d700 + MapboxCoreNavigation: c3cf6d3a8f6991f59833cfa133258b48f8bf2340 MapboxDirections: 31d61b8369d5dde6f6828f72905ab9a7e054cd2c MapboxMaps: f10aecadbfb7cf96368852ca313101eb4171da53 MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6 MapboxNavigation: e781ce4c3b987180a0eb46145e3118c465eb8e92 - MapboxNavigationNative: 2953310e4e05fcc3b335bdbeee861347272ac38f + MapboxNavigationNative: 93ca2ddd50188ea190c2ef95a719bbb9c27596f3 MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77 Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1 Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0 diff --git a/Tests/MapboxCoreNavigationTests/Progress/RouteProgressTests.swift b/Tests/MapboxCoreNavigationTests/Progress/RouteProgressTests.swift index ba8d42f0548..8fe94674713 100644 --- a/Tests/MapboxCoreNavigationTests/Progress/RouteProgressTests.swift +++ b/Tests/MapboxCoreNavigationTests/Progress/RouteProgressTests.swift @@ -346,7 +346,8 @@ class RouteProgressTests: TestCase { upcomingRouteAlertUpdates: [], nextWaypointIndex: 0, layer: nil, - isSyntheticLocation: false + isSyntheticLocation: false, + correctedLocationData: nil ) }