Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vk/release 2.17.0 cherry pick #4560

Merged
merged 1 commit into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
### Packaging

* MapboxNavigation now requires [MapboxMaps v10.16.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.16.1). ([#4557](https://github.com/mapbox/mapbox-navigation-ios/pull/4557))
* MapboxCoreNavigation now requires [MapboxNavigationNative v159._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/159.0.0). ([#4557](https://github.com/mapbox/mapbox-navigation-ios/pull/4557))
* MapboxCoreNavigation now requires [MapboxNavigationNative v160._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/160.0.0). ([#4559](https://github.com/mapbox/mapbox-navigation-ios/pull/4559))

### CarPlay

Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.8.3
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 159.0.0
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 160.0.0
github "mapbox/mapbox-directions-swift" ~> 2.11.1
github "mapbox/mapbox-events-ios" ~> 1.0.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.8.3"
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "159.0.0"
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "160.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"
Expand Down
2 changes: 1 addition & 1 deletion MapboxCoreNavigation.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.module_name = "MapboxCoreNavigation"

s.dependency "MapboxNavigationNative", "~> 159.0.0"
s.dependency "MapboxNavigationNative", "~> 160.0.0"
s.dependency "MapboxDirections", "~> 2.11.1"
s.dependency "MapboxMobileEvents", "~> 1.0"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
"repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
"state": {
"branch": null,
"revision": "caa5c3486b14e63ee89db253df54d61c49ba5704",
"version": "159.0.0"
"revision": "7f3a62751e250166e56120c5854239287ab22b46",
"version": "160.0.0"
}
},
{
Expand Down
12 changes: 6 additions & 6 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
"repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
"state": {
"branch": null,
"revision": "caa5c3486b14e63ee89db253df54d61c49ba5704",
"version": "159.0.0"
"revision": "7f3a62751e250166e56120c5854239287ab22b46",
"version": "160.0.0"
}
},
{
Expand Down Expand Up @@ -114,8 +114,8 @@
"repositoryURL": "https://github.com/apple/swift-argument-parser",
"state": {
"branch": null,
"revision": "fee6933f37fde9a5e12a1e4aeaa93fe60116ff2a",
"version": "1.2.2"
"revision": "8f4d2753f0e4778c76d5f05ad16c74f707390531",
"version": "1.2.3"
}
},
{
Expand All @@ -132,8 +132,8 @@
"repositoryURL": "https://github.com/mapbox/turf-swift.git",
"state": {
"branch": null,
"revision": "87b5b37108ba9f37f0885b586d8f6355d8240dd8",
"version": "2.6.1"
"revision": "f0afe204b4266337066a436becab62fdd2b32378",
"version": "2.7.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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: "159.0.0"),
.package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "160.0.0"),
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.16.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"),
Expand Down
8 changes: 4 additions & 4 deletions Tests/CocoaPodsTest/PodInstall/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PODS:
- MapboxCoreNavigation (2.17.0-rc.1):
- MapboxDirections (~> 2.11.1)
- MapboxMobileEvents (~> 1.0)
- MapboxNavigationNative (~> 159.0.0)
- MapboxNavigationNative (~> 160.0.0)
- MapboxDirections (2.11.1):
- Polyline (~> 5.0)
- Turf (~> 2.6.1)
Expand All @@ -21,7 +21,7 @@ PODS:
- MapboxMobileEvents (~> 1.0)
- MapboxSpeech (~> 2.0)
- Solar-dev (~> 3.0)
- MapboxNavigationNative (159.0.0):
- MapboxNavigationNative (160.0.0):
- MapboxCommon (~> 23.8)
- MapboxSpeech (2.1.1)
- Polyline (5.1.0)
Expand Down Expand Up @@ -54,12 +54,12 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
MapboxCommon: b2c348867dfed7d7a23545e6c2024d712bfda10f
MapboxCoreMaps: c66f482b5ea983cf873122853c4ee94c159bec43
MapboxCoreNavigation: 58e5473d44ab3a6ff26bcbde3d5579ca35cd72b4
MapboxCoreNavigation: 10b8de6400f0f864b68dc5ca8add539a4574aaa5
MapboxDirections: 31d61b8369d5dde6f6828f72905ab9a7e054cd2c
MapboxMaps: fdbe05e3899abd24f31a7f91789586e44e57f7fc
MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
MapboxNavigation: f46249fd6dd8288cdccaa631bc86daedfdd6550f
MapboxNavigationNative: fff991d15708bb063ded25be6fb296d23c6a8308
MapboxNavigationNative: f501a2f469374e6ad1caa807c9fd8ac8e3b49082
MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77
Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0
Expand Down