Skip to content

Commit 05c6f97

Browse files
UdumftUdumft
authored
Dependencies update (#4396)
dependencies updated; CHANGELOG updated; added ID field support to Interchange and Junction types. Unit tests updated
1 parent 477f957 commit 05c6f97

File tree

13 files changed

+91
-51
lines changed

13 files changed

+91
-51
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changes to the Mapbox Navigation SDK for iOS
22

3+
## v2.12.0
4+
5+
### Packaging
6+
7+
* MapboxCoreNavigation now requires [MapboxNavigationNative v127._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/127.0.0). ([#4396](https://github.com/mapbox/mapbox-navigation-ios/pull/4396))
8+
* MapboxCoreNavigation now requires [MapboxDirections v2.11.0-alpha.1](https://github.com/mapbox/mapbox-directions-swift/releases/tag/v2.11.0-alpha.1). ([#4396](https://github.com/mapbox/mapbox-navigation-ios/pull/4396))
9+
* MapboxNavigation now requires [MapboxMaps v10.12.0-beta.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.12.0-beta.1). ([#4396](https://github.com/mapbox/mapbox-navigation-ios/pull/4396))
10+
11+
### Electronic horizon
12+
13+
**Note:** The Mapbox Electronic Horizon feature of the Mapbox Navigation SDK is in public beta and is subject to changes, including its pricing. Use of the feature is subject to the beta product restrictions in the Mapbox Terms of Service. Mapbox reserves the right to eliminate any free tier or free evaluation offers at any time and require customers to place an order to purchase the Mapbox Electronic Horizon feature, regardless of the level of use of the feature.
14+
* Added`Interchange.identifier` and `Junction.identifier` fields. ([#4396](https://github.com/mapbox/mapbox-navigation-ios/pull/4396))
15+
316
## v2.11.0
417

518
### Packaging

‎Cartfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.3.1
2-
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 126.0.0
3-
github "mapbox/mapbox-directions-swift" == 2.10.0-rc.1
2+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 127.0.0
3+
github "mapbox/mapbox-directions-swift" == 2.11.0-alpha.1
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,6 +1,6 @@
11
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.3.1"
2-
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "126.0.0"
3-
github "mapbox/mapbox-directions-swift" "v2.10.0-rc.1"
2+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "127.0.0"
3+
github "mapbox/mapbox-directions-swift" "v2.11.0-alpha.1"
44
github "mapbox/mapbox-events-ios" "v1.0.10"
55
github "mapbox/turf-swift" "v2.6.1"
66
github "mattgallagher/CwlPreconditionTesting" "2.1.0"

‎MapboxCoreNavigation.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ Pod::Spec.new do |s|
4444
s.requires_arc = true
4545
s.module_name = "MapboxCoreNavigation"
4646

47-
s.dependency "MapboxNavigationNative", "~> 126.0.0"
48-
s.dependency "MapboxDirections-pre", "2.10.0-rc.1"
47+
s.dependency "MapboxNavigationNative", "~> 127.0.0"
48+
s.dependency "MapboxDirections-pre", "2.11.0-alpha.1"
4949
s.dependency "MapboxMobileEvents", "~> 1.0"
5050

5151
s.swift_version = "5.5"

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

Lines changed: 10 additions & 10 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.11.0"
47+
s.dependency "MapboxMaps", "~> 10.12.0-beta.1"
4848
s.dependency "Solar-dev", "~> 3.0"
4949
s.dependency "MapboxSpeech", "~> 2.0"
5050
s.dependency "MapboxMobileEvents", "~> 1.0"

‎Package.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ let package = Package(
2222
)
2323
],
2424
dependencies: [
25-
.package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.10.0-rc.1")),
25+
.package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.11.0-alpha.1")),
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: "126.0.0"),
28-
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.11.0"),
27+
.package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "127.0.0"),
28+
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.12.0-beta.1"),
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: "CwlPreconditionTesting", url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", from: "2.1.0"),

‎Sources/MapboxCoreNavigation/EHorizon/Interchange.swift‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,30 @@ import MapboxNavigationNative
33

44
/// Contains information about routing and passing interchange along the route.
55
public struct Interchange: Equatable {
6+
/// Interchange identifier, if available.
7+
public var identifier: String
68
/// The localized names of the interchange, if available.
79
public let names: [LocalizedRoadObjectName]
810

911
/// Initializes a new `Interchange` object.
1012
/// - Parameters:
1113
/// - names: The localized names of the interchange.
1214
public init(names: [LocalizedRoadObjectName]) {
15+
self.identifier = ""
16+
self.names = names
17+
}
18+
19+
/// Initializes a new `Interchange` object.
20+
/// - Parameters:
21+
/// - identifier: Interchange identifier.
22+
/// - names: The localized names of the interchange.
23+
public init(identifier: String, names: [LocalizedRoadObjectName]) {
24+
self.identifier = identifier
1325
self.names = names
1426
}
1527

1628
init(_ icInfo: IcInfo) {
1729
let names = icInfo.name.map { LocalizedRoadObjectName($0) }
18-
self.init(names: names)
30+
self.init(identifier:icInfo.id, names: names)
1931
}
2032
}

‎Sources/MapboxCoreNavigation/EHorizon/Junction.swift‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,30 @@ import MapboxNavigationNative
33

44
/// Contains information about routing and passing junction along the route.
55
public struct Junction: Equatable {
6+
/// Junction identifier, if available.
7+
public var identifier: String
68
/// The localized names of the junction, if available.
79
public let names: [LocalizedRoadObjectName]
810

911
/// Initializes a new `Junction` object.
1012
/// - Parameters:
1113
/// - names: The localized names of the interchange.
1214
public init(names: [LocalizedRoadObjectName]) {
15+
self.identifier = ""
16+
self.names = names
17+
}
18+
19+
/// Initializes a new `Junction` object.
20+
/// - Parameters:
21+
/// - identifier: Junction identifier.
22+
/// - names: The localized names of the interchange.
23+
public init(identifier: String, names: [LocalizedRoadObjectName]) {
24+
self.identifier = identifier
1325
self.names = names
1426
}
1527

1628
init(_ jctInfo: JctInfo) {
1729
let names = jctInfo.name.map { LocalizedRoadObjectName($0) }
18-
self.init(names: names)
30+
self.init(identifier: jctInfo.id, names: names)
1931
}
2032
}

‎Tests/CocoaPodsTest/PodInstall/Podfile.lock‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
PODS:
2-
- MapboxCommon (23.3.1)
3-
- MapboxCoreMaps (10.11.1):
4-
- MapboxCommon (~> 23.3)
2+
- MapboxCommon (23.4.0-beta.1)
3+
- MapboxCoreMaps (10.12.0-beta.1):
4+
- MapboxCommon (~> 23.4.0-beta)
55
- MapboxCoreNavigation (2.11.0-beta.3):
6-
- MapboxDirections-pre (= 2.10.0-rc.1)
6+
- MapboxDirections-pre (= 2.11.0-alpha.1)
77
- MapboxMobileEvents (~> 1.0)
8-
- MapboxNavigationNative (~> 126.0.0)
9-
- MapboxDirections-pre (2.10.0-rc.1):
8+
- MapboxNavigationNative (~> 127.0.0)
9+
- MapboxDirections-pre (2.11.0-alpha.1):
1010
- Polyline (~> 5.0)
1111
- Turf (~> 2.6.1)
12-
- MapboxMaps (10.11.0):
13-
- MapboxCommon (= 23.3.1)
14-
- MapboxCoreMaps (= 10.11.1)
12+
- MapboxMaps (10.12.0-beta.1):
13+
- MapboxCommon (= 23.4.0-beta.1)
14+
- MapboxCoreMaps (= 10.12.0-beta.1)
1515
- MapboxMobileEvents (= 1.0.10)
1616
- Turf (~> 2.0)
1717
- MapboxMobileEvents (1.0.10)
1818
- MapboxNavigation (2.11.0-beta.3):
1919
- MapboxCoreNavigation (= 2.11.0-beta.3)
20-
- MapboxMaps (~> 10.11.0)
20+
- MapboxMaps (~> 10.12.0-beta.1)
2121
- MapboxMobileEvents (~> 1.0)
2222
- MapboxSpeech (~> 2.0)
2323
- Solar-dev (~> 3.0)
24-
- MapboxNavigationNative (126.0.0):
25-
- MapboxCommon (~> 23.3)
24+
- MapboxNavigationNative (127.0.0):
25+
- MapboxCommon (~> 23.4.0-beta.1)
2626
- MapboxSpeech (2.1.1)
2727
- Polyline (5.1.0)
2828
- Solar-dev (3.0.1)
@@ -52,14 +52,14 @@ EXTERNAL SOURCES:
5252
:path: "../../../"
5353

5454
SPEC CHECKSUMS:
55-
MapboxCommon: 762407ce0c8353d9b9a0d0b72f9dc1c30d1dc904
56-
MapboxCoreMaps: 03e7214fabb54d496ff56314ff8159dd264b6093
57-
MapboxCoreNavigation: d6692fd8e15d75f5977a0ba91827e2d1741addb4
58-
MapboxDirections-pre: 183e5117705c4147e2b6aa1e6c897c5f16a533ef
59-
MapboxMaps: 7981622c06558adbabbe1c7543ba4d18d26ecb23
55+
MapboxCommon: 6290e4595b5d09bf422253fd42fd0acf1fa9de63
56+
MapboxCoreMaps: 97c723374198c38a5318199321fc235c196364a0
57+
MapboxCoreNavigation: 599e5359c250508c5fe80c5cdf424c9f2701c97a
58+
MapboxDirections-pre: 2741f1147b69240915d9ab8963c4c0aff53abcb4
59+
MapboxMaps: 984a6f1d57215f8f289ffc3584626fa9fffd2d42
6060
MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
61-
MapboxNavigation: 0b79f6c75bdff44abca7496833c54589c132d44f
62-
MapboxNavigationNative: 1e6c7e81053e2e8288c05c6ed2e3d89849aef53d
61+
MapboxNavigation: 4a7312c29f31d9d4f114583c5db6eaf5eb9d2d3f
62+
MapboxNavigationNative: fe8d89fbe317a1ce511e8f6c608459e262187d34
6363
MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77
6464
Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
6565
Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0

0 commit comments

Comments
 (0)