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

Dependency update #4520

Merged
merged 2 commits into from
Aug 4, 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
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

### Packaging

* MapboxCoreNavigation now requires [MapboxNavigationNative v144._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/144.0.0). ([#4506](https://github.com/mapbox/mapbox-navigation-ios/pull/4506))
* MapboxNavigation now requires [MapboxMaps v10.15.0-rc.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.15.0-rc.1). ([#4506](https://github.com/mapbox/mapbox-navigation-ios/pull/4506))
* MapboxCoreNavigation now requires [MapboxNavigationNative v148._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/148.0.0). ([#4518](https://github.com/mapbox/mapbox-navigation-ios/pull/4518))
* MapboxNavigation now requires [MapboxMaps v10.15.0](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.15.0). ([#4518](https://github.com/mapbox/mapbox-navigation-ios/pull/4518))

### Routing
* Route request timeout errors are now considered failures as opposed to cancellations. `RouterDelegate.router(_:didFailToRerouteWith:)` will be called in this case. ([#4490](https://github.com/mapbox/mapbox-navigation-ios/pull/4490))
Expand Down
4 changes: 2 additions & 2 deletions 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.7.0-rc.1
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 144.0.0
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.7.0
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 148.0.0
github "mapbox/mapbox-directions-swift" ~> 2.10.0
github "mapbox/mapbox-events-ios" ~> 1.0.0
4 changes: 2 additions & 2 deletions 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.7.0-rc.1"
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "144.0.0"
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.7.0"
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "148.0.0"
github "mapbox/mapbox-directions-swift" "v2.10.0"
github "mapbox/mapbox-events-ios" "v1.0.10"
github "mapbox/turf-swift" "v2.6.1"
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", "~> 144.0.0"
s.dependency "MapboxNavigationNative", "~> 148.0.0"
s.dependency "MapboxDirections", "~> 2.10.0"
s.dependency "MapboxMobileEvents", "~> 1.0"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
"repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
"state": {
"branch": null,
"revision": "19f2617131b69d2df4e282f6ee68fa68d7ec1f70",
"version": "23.7.0-rc.1"
"revision": "e5cb508f09e80b877a695a0914140d95a41152fc",
"version": "23.7.0"
}
},
{
"package": "MapboxCoreMaps",
"repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
"state": {
"branch": null,
"revision": "2cbc9f3a4c0168d7ee3acd92de81a49a357def70",
"version": "10.15.0-rc.1"
"revision": "de58d2110c67f657badae735aacd924ca7349c59",
"version": "10.15.0"
}
},
{
Expand All @@ -60,17 +60,17 @@
"repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
"state": {
"branch": null,
"revision": "0b7df0c6e6fbbb390651472057df44f6d0b18535",
"version": "10.15.0-rc.1"
"revision": "aeef597eea99f897afcbd03bbc9afc7640bc3801",
"version": "10.15.0"
}
},
{
"package": "MapboxNavigationNative",
"repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
"state": {
"branch": null,
"revision": "8cf20c568504957211e14c176bb2895bc8518c7f",
"version": "144.0.0"
"revision": "20901ac3427e02723ad516ca0d98ccb60da39b5f",
"version": "148.0.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion MapboxNavigation.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Pod::Spec.new do |s|
s.module_name = "MapboxNavigation"

s.dependency "MapboxCoreNavigation", "#{s.version.to_s}"
s.dependency "MapboxMaps", "10.15.0-rc.1"
s.dependency "MapboxMaps", "~> 10.15.0"
s.dependency "Solar-dev", "~> 3.0"
s.dependency "MapboxSpeech", "~> 2.0"
s.dependency "MapboxMobileEvents", "~> 1.0"
Expand Down
16 changes: 8 additions & 8 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
"repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
"state": {
"branch": null,
"revision": "f46c17b958f465c120d89bff4c4fa888a8d4a798",
"version": "23.7.0-beta.1"
"revision": "e5cb508f09e80b877a695a0914140d95a41152fc",
"version": "23.7.0"
}
},
{
"package": "MapboxCoreMaps",
"repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
"state": {
"branch": null,
"revision": "55f883970d3ed0a489353dc2f765ae4120bc5533",
"version": "10.15.0-beta.1"
"revision": "de58d2110c67f657badae735aacd924ca7349c59",
"version": "10.15.0"
}
},
{
Expand All @@ -60,17 +60,17 @@
"repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
"state": {
"branch": null,
"revision": "c6b7ec640f26657c23674c9a051fcabba4ebcf27",
"version": "10.15.0-beta.1"
"revision": "aeef597eea99f897afcbd03bbc9afc7640bc3801",
"version": "10.15.0"
}
},
{
"package": "MapboxNavigationNative",
"repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
"state": {
"branch": null,
"revision": "bedbb75271ed9d09b2ec8097683f1e55a3b9941a",
"version": "142.0.0"
"revision": "20901ac3427e02723ad516ca0d98ccb60da39b5f",
"version": "148.0.0"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ let package = Package(
dependencies: [
.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: "144.0.0"),
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.15.0-rc.1")),
.package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "148.0.0"),
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.15.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"),
.package(name: "CwlPreconditionTesting", url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", from: "2.1.0"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ public final class TestNavigationStatusProvider {
offRoadProba: 0,
offRoadStateProvider: .unknown,
activeGuidanceInfo: activeGuidanceInfo,
upcomingRouteAlerts: [],
upcomingRouteAlertUpdates: upcomingRouteAlertUpdates,
nextWaypointIndex: 0,
layer: nil)
layer: nil,
isSyntheticLocation: false)
}
}
34 changes: 17 additions & 17 deletions Tests/CocoaPodsTest/PodInstall/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
PODS:
- MapboxCommon (23.7.0-rc.1)
- MapboxCoreMaps (10.15.0-rc.1):
- MapboxCommon (~> 23.7.0-rc)
- MapboxCommon (23.7.0)
- MapboxCoreMaps (10.15.0):
- MapboxCommon (~> 23.7)
- MapboxCoreNavigation (2.15.0-rc.1):
- MapboxDirections (~> 2.10.0)
- MapboxMobileEvents (~> 1.0)
- MapboxNavigationNative (~> 144.0.0)
- MapboxNavigationNative (~> 148.0.0)
- MapboxDirections (2.10.0):
- Polyline (~> 5.0)
- Turf (~> 2.6.1)
- MapboxMaps (10.15.0-rc.1):
- MapboxCommon (= 23.7.0-rc.1)
- MapboxCoreMaps (= 10.15.0-rc.1)
- MapboxMaps (10.15.0):
- MapboxCommon (= 23.7.0)
- MapboxCoreMaps (= 10.15.0)
- MapboxMobileEvents (= 1.0.10)
- Turf (~> 2.0)
- MapboxMobileEvents (1.0.10)
- MapboxNavigation (2.15.0-rc.1):
- MapboxCoreNavigation (= 2.15.0-rc.1)
- MapboxMaps (= 10.15.0-rc.1)
- MapboxMaps (~> 10.15.0)
- MapboxMobileEvents (~> 1.0)
- MapboxSpeech (~> 2.0)
- Solar-dev (~> 3.0)
- MapboxNavigationNative (144.0.0):
- MapboxCommon (~> 23.7.0-rc.1)
- MapboxNavigationNative (148.0.0):
- MapboxCommon (~> 23.7)
- MapboxSpeech (2.1.1)
- Polyline (5.1.0)
- Solar-dev (3.0.1)
Expand Down Expand Up @@ -52,19 +52,19 @@ EXTERNAL SOURCES:
:path: "../../../"

SPEC CHECKSUMS:
MapboxCommon: b2fa75180a508e5e791dff847f4162f855900ac7
MapboxCoreMaps: 306bf4676c684bd44a7c132f95685cf2cb4db045
MapboxCoreNavigation: 4671821630768ea1855dd70a5356522b19d7683b
MapboxCommon: dcbdb86acbcfc1a23efd341ed097c6c63ab532a9
MapboxCoreMaps: bcbaac14467616940187f79bba49ca491cd37906
MapboxCoreNavigation: 8aced490a1965b907005ef200b9bacb206413c9f
MapboxDirections: a620d78a54312c392323ba211df8ae7dd9a28ab4
MapboxMaps: 3f884dca3b4c488f8bb2dc09e9a4d946ca64ea9c
MapboxMaps: 1fd9d97d0e8eceb7a45b9ac8bf87a8922da881a8
MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
MapboxNavigation: 71ca28e5c07a00f552b35e89ad238e78bf17d0cc
MapboxNavigationNative: b53f5eef5b6ae56d70827197377893aa9c80a67d
MapboxNavigation: 6bb4aeab35e7e4d6a44efec84c159e9b382d1488
MapboxNavigationNative: 69682e4b092788bea0a80f56fae3f148cb3e177a
MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77
Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0
Turf: 469ce2c3d22e5e8e4818d5a3b254699a5c89efa4

PODFILE CHECKSUM: bde8103af0e9b326531ee57cf1fa935cbd5f2e18

COCOAPODS: 1.11.3
COCOAPODS: 1.12.1
Original file line number Diff line number Diff line change
Expand Up @@ -343,10 +343,10 @@ class RouteProgressTests: TestCase {
legProgress: .init(distanceTraveled: 0, fractionTraveled: 0, remainingDistance: 0, remainingDuration: 0),
step: .init(distanceTraveled: stepDistanceTraveled, fractionTraveled: 0, remainingDistance: 0, remainingDuration: 0)
),
upcomingRouteAlerts: [],
upcomingRouteAlertUpdates: [],
nextWaypointIndex: 0,
layer: nil
layer: nil,
isSyntheticLocation: false
)
}

Expand Down