Skip to content

Commit 0d14001

Browse files
ShanMa1991ShanMa1991
authored
Update dependency to NavNative v111.0, Maps v10.7.0, Common v22.1.0 (#4044)
1 parent 7886707 commit 0d14001

File tree

9 files changed

+40
-35
lines changed

9 files changed

+40
-35
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44

55
### Packaging
66

7-
* MapboxNavigation now requires [MapboxMaps v10.7.0-rc.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.7.0-rc.1). ([#4012](https://github.com/mapbox/mapbox-navigation-ios/pull/4012))
8-
* MapboxCoreNavigation now requires [MapboxNavigationNative v110._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/110.0.0). ([#4037](https://github.com/mapbox/mapbox-navigation-ios/pull/4037))
7+
* MapboxNavigation now requires [MapboxMaps v10.7._x_](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.7.0). ([#4044](https://github.com/mapbox/mapbox-navigation-ios/pull/4044))
8+
* MapboxCoreNavigation now requires [MapboxNavigationNative v111._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/111.0.0). ([#4044](https://github.com/mapbox/mapbox-navigation-ios/pull/4044))
9+
10+
### Routing
11+
12+
* Fixed lost target and name fields in waypoints after rerouting, and the bearing calculation error during tunnel dead reckoning. ([#4044](https://github.com/mapbox/mapbox-navigation-ios/pull/4044))
913

1014
### Map
1115

‎Cartfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 22.1.0-rc.1
2-
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 110.0
1+
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" ~> 22.1.0
2+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 111.0
33
github "mapbox/mapbox-directions-swift" ~> 2.6
44
github "mapbox/mapbox-events-ios" ~> 1.0.0

‎Cartfile.resolved‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "22.1.0-rc.1"
2-
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "110.0.0"
1+
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "22.1.0"
2+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "111.0.0"
33
github "Quick/Nimble" "v9.2.1"
44
github "Quick/Quick" "v3.1.2"
55
github "mapbox/mapbox-directions-swift" "v2.6.0"

‎MapboxCoreNavigation.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Pod::Spec.new do |s|
4040
s.requires_arc = true
4141
s.module_name = "MapboxCoreNavigation"
4242

43-
s.dependency "MapboxNavigationNative", "~> 110.0"
43+
s.dependency "MapboxNavigationNative", "~> 111.0"
4444
s.dependency "MapboxDirections", "~> 2.6"
4545
s.dependency "MapboxMobileEvents", "~> 1.0"
4646

‎MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MapboxNavigation.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Pod::Spec.new do |s|
4444
s.module_name = "MapboxNavigation"
4545

4646
s.dependency "MapboxCoreNavigation", "#{s.version.to_s}"
47-
s.dependency "MapboxMaps", "10.7.0-rc.1"
47+
s.dependency "MapboxMaps", "~> 10.7.0"
4848
s.dependency "Solar-dev", "~> 3.0"
4949
s.dependency "MapboxSpeech", "~> 2.0"
5050
s.dependency "MapboxMobileEvents", "~> 1.0"

‎Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ let package = Package(
2424
dependencies: [
2525
.package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.6.0"),
2626
.package(name: "MapboxMobileEvents", url: "https://github.com/mapbox/mapbox-events-ios.git", from: "1.0.0"),
27-
.package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "110.0.0"),
28-
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.7.0-rc.1")),
27+
.package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "111.0.0"),
28+
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.7.0"),
2929
.package(name: "Solar", url: "https://github.com/ceeK/Solar.git", from: "3.0.0"),
3030
.package(name: "MapboxSpeech", url: "https://github.com/mapbox/mapbox-speech-swift.git", from: "2.0.0"),
3131
.package(name: "Quick", url: "https://github.com/Quick/Quick.git", from: "3.1.2"),

‎Sources/MapboxCoreNavigation/MapboxRoutingProvider.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,8 @@ public class MapboxRoutingProvider: RoutingProvider {
305305
let refreshOptions = RouteRefreshOptions(requestId: responseIdentifier,
306306
routeIndex: routeIndex,
307307
legIndex: startLegIndex,
308-
routingProfile: routeOptions.profileIdentifier.nativeProfile)
308+
routingProfile: routeOptions.profileIdentifier.nativeProfile,
309+
currentRouteGeometryIndex: nil)
309310

310311
requestId = router.getRouteRefresh(for: refreshOptions, callback: { [weak self] result, _ in
311312
guard let self = self else { return }

‎Tests/CocoaPodsTest/PodInstall/Podfile.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
PODS:
2-
- MapboxCommon (22.1.0-rc.1)
3-
- MapboxCoreMaps (10.7.0-rc.1):
4-
- MapboxCommon (~> 22.1.0-rc)
2+
- MapboxCommon (22.1.0)
3+
- MapboxCoreMaps (10.7.0):
4+
- MapboxCommon (~> 22.1)
55
- MapboxCoreNavigation (2.7.0-beta.3):
66
- MapboxDirections (~> 2.6)
77
- MapboxMobileEvents (~> 1.0)
8-
- MapboxNavigationNative (~> 110.0)
8+
- MapboxNavigationNative (~> 111.0)
99
- MapboxDirections (2.6.0):
1010
- Polyline (~> 5.0)
1111
- Turf (~> 2.4)
12-
- MapboxMaps (10.7.0-rc.1):
13-
- MapboxCommon (= 22.1.0-rc.1)
14-
- MapboxCoreMaps (= 10.7.0-rc.1)
12+
- MapboxMaps (10.7.0):
13+
- MapboxCommon (= 22.1.0)
14+
- MapboxCoreMaps (= 10.7.0)
1515
- MapboxMobileEvents (= 1.0.8)
1616
- Turf (~> 2.0)
1717
- MapboxMobileEvents (1.0.8)
1818
- MapboxNavigation (2.7.0-beta.3):
1919
- MapboxCoreNavigation (= 2.7.0-beta.3)
20-
- MapboxMaps (= 10.7.0-rc.1)
20+
- MapboxMaps (~> 10.7.0)
2121
- MapboxMobileEvents (~> 1.0)
2222
- MapboxSpeech (~> 2.0)
2323
- Solar-dev (~> 3.0)
24-
- MapboxNavigationNative (110.0.0):
25-
- MapboxCommon (~> 22.1.0-rc.1)
24+
- MapboxNavigationNative (111.0.0):
25+
- MapboxCommon (~> 22.1)
2626
- MapboxSpeech (2.0.1)
2727
- Polyline (5.0.2)
2828
- Solar-dev (3.0.1)
@@ -52,14 +52,14 @@ EXTERNAL SOURCES:
5252
:path: "../../../"
5353

5454
SPEC CHECKSUMS:
55-
MapboxCommon: a4cf3c329d10c66d14d1b43d38af6dbd90a7d8f7
56-
MapboxCoreMaps: 03bb0539ed3a8913b9eb01211d15de0574dbf642
57-
MapboxCoreNavigation: 227f4abaea1e599c07d3185bf884a6e425343b16
55+
MapboxCommon: 1e26303f61682e6307a10162792ea0f018d037b9
56+
MapboxCoreMaps: 929f2cf9de62782347db31d6c04dc1b6b4ba80ad
57+
MapboxCoreNavigation: 65ed77779f6323751df9a34e89735008a0ba856d
5858
MapboxDirections: 4a51348c02146bd246ce67c3e3d06e809003fbba
59-
MapboxMaps: c982c6ffebd7cbd5c9f69153dbcdadd5adf3f631
59+
MapboxMaps: c7df1efe838d7acb54929ada9ee735949137fde9
6060
MapboxMobileEvents: febdd92835daa258ca1c1faad0821c0b3394ef40
61-
MapboxNavigation: 0043250d453488556091e4028d135d1adaf2609c
62-
MapboxNavigationNative: dfcdc073de416677f6be529dddd184dd7157d46a
61+
MapboxNavigation: 0776e0177008ab86ef82abf6be19a4fc4a180fa3
62+
MapboxNavigationNative: 62b6e12518362e7691fa97c0fa434ec950376bfb
6363
MapboxSpeech: fb9129e1ca7cc2dd465397d2aea1f5f510de260e
6464
Polyline: fce41d72e1146c41c6d081f7656827226f643dff
6565
Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0

0 commit comments

Comments
 (0)