Skip to content

Commit fe4bbd4

Browse files
UdumftUdumft
authored
Dependencies update (#4605)
* vk/dependencies-update: bumped Directions to 2.12.0, Maps to 10.16.5. Now compatible with Turf 2.7.0.; bumped NN to v202; update cocoapods in gemfile to 1.14; CHANGELOG updated
1 parent 2463f19 commit fe4bbd4

File tree

12 files changed

+86
-70
lines changed

12 files changed

+86
-70
lines changed

‎CHANGELOG.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
### Packaging
66

7-
* MapboxNavigation now requires [MapboxMaps v10.16.4](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.16.4). ([#4585](https://github.com/mapbox/mapbox-navigation-ios/pull/4585))
8-
* MapboxCoreNavigation now requires [MapboxNavigationNative v182._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/182.0.0). ([#4585](https://github.com/mapbox/mapbox-navigation-ios/pull/4585))
7+
* MapboxNavigation now requires [MapboxMaps v10.16.5](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.16.5). ([#4605](https://github.com/mapbox/mapbox-navigation-ios/pull/4605))
8+
* MapboxCoreNavigation now requires [MapboxDirections v2.12.0](https://github.com/mapbox/mapbox-directions-swift/releases/tag/v2.12.0). ([#4605](https://github.com/mapbox/mapbox-navigation-ios/pull/4605))
9+
* MapboxCoreNavigation now requires [MapboxNavigationNative v202._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/202.0.0). ([#4605](https://github.com/mapbox/mapbox-navigation-ios/pull/4605))
910
* MapboxCoreNavigation is no longer dependent on MapboxMobileEvents. ([#4572](https://github.com/mapbox/mapbox-navigation-ios/pull/4572))
1011
* Added a Polish localization. ([#4582](https://github.com/mapbox/mapbox-navigation-ios/pull/4582))
1112

‎Cartfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.8.6
2-
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 182.0.0
3-
github "mapbox/mapbox-directions-swift" ~> 2.11.1
2+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 202.0.0
3+
github "mapbox/mapbox-directions-swift" ~> 2.12.0

‎Cartfile.resolved

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.8.6"
2-
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "182.0.0"
3-
github "mapbox/mapbox-directions-swift" "v2.11.1"
4-
github "mapbox/turf-swift" "v2.7.0"
5-
github "mattgallagher/CwlPreconditionTesting" "2.1.2"
2+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "202.0.0"
3+
github "mapbox/mapbox-directions-swift" "v2.12.0"
4+
github "mapbox/turf-swift" "v2.8.0"
5+
github "mattgallagher/CwlPreconditionTesting" "2.2.1"
66
github "pointfreeco/swift-snapshot-testing" "1.9.0"
77
github "raphaelmor/Polyline" "v5.1.0"

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
22
gem 'fastlane'
33
gem 'snapshot'
4-
gem 'cocoapods', '~> 1.10'
4+
gem 'cocoapods', '~> 1.14'
55
gem 'jazzy', '~> 0.14'

‎Gemfile.lock

+30-17
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (7.0.6)
8+
activesupport (7.1.3.2)
9+
base64
10+
bigdecimal
711
concurrent-ruby (~> 1.0, >= 1.0.2)
12+
connection_pool (>= 2.2.5)
13+
drb
814
i18n (>= 1.6, < 2)
915
minitest (>= 5.1)
16+
mutex_m
1017
tzinfo (~> 2.0)
11-
addressable (2.8.4)
18+
addressable (2.8.6)
1219
public_suffix (>= 2.0.2, < 6.0)
1320
algoliasearch (1.27.5)
1421
httpclient (~> 2.8, >= 2.8.3)
@@ -32,13 +39,15 @@ GEM
3239
aws-sigv4 (1.5.2)
3340
aws-eventstream (~> 1, >= 1.0.2)
3441
babosa (1.0.4)
42+
base64 (0.2.0)
43+
bigdecimal (3.1.6)
3544
claide (1.1.0)
36-
cocoapods (1.12.1)
45+
cocoapods (1.15.2)
3746
addressable (~> 2.8)
3847
claide (>= 1.0.2, < 2.0)
39-
cocoapods-core (= 1.12.1)
48+
cocoapods-core (= 1.15.2)
4049
cocoapods-deintegrate (>= 1.0.3, < 2.0)
41-
cocoapods-downloader (>= 1.6.0, < 2.0)
50+
cocoapods-downloader (>= 2.1, < 3.0)
4251
cocoapods-plugins (>= 1.0.0, < 2.0)
4352
cocoapods-search (>= 1.0.0, < 2.0)
4453
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -50,8 +59,8 @@ GEM
5059
molinillo (~> 0.8.0)
5160
nap (~> 1.0)
5261
ruby-macho (>= 2.3.0, < 3.0)
53-
xcodeproj (>= 1.21.0, < 2.0)
54-
cocoapods-core (1.12.1)
62+
xcodeproj (>= 1.23.0, < 2.0)
63+
cocoapods-core (1.15.2)
5564
activesupport (>= 5.0, < 8)
5665
addressable (~> 2.8)
5766
algoliasearch (~> 1.0)
@@ -62,7 +71,7 @@ GEM
6271
public_suffix (~> 4.0)
6372
typhoeus (~> 1.0)
6473
cocoapods-deintegrate (1.0.5)
65-
cocoapods-downloader (1.6.3)
74+
cocoapods-downloader (2.1)
6675
cocoapods-plugins (1.0.0)
6776
nap
6877
cocoapods-search (1.0.1)
@@ -74,13 +83,15 @@ GEM
7483
colored2 (3.1.2)
7584
commander (4.6.0)
7685
highline (~> 2.0.0)
77-
concurrent-ruby (1.2.2)
86+
concurrent-ruby (1.2.3)
87+
connection_pool (2.4.1)
7888
declarative (0.0.20)
7989
digest-crc (0.6.4)
8090
rake (>= 12.0.0, < 14.0.0)
8191
domain_name (0.5.20190701)
8292
unf (>= 0.0.5, < 1.0.0)
8393
dotenv (2.8.1)
94+
drb (2.2.1)
8495
emoji_regex (3.2.3)
8596
escape (0.0.4)
8697
ethon (0.16.0)
@@ -154,7 +165,7 @@ GEM
154165
xcodeproj (>= 1.13.0, < 2.0.0)
155166
xcpretty (~> 0.3.0)
156167
xcpretty-travis-formatter (>= 0.0.3)
157-
ffi (1.15.5)
168+
ffi (1.16.3)
158169
fourflusher (2.3.1)
159170
fuzzy_match (2.0.4)
160171
gh_inspector (1.1.3)
@@ -213,22 +224,24 @@ GEM
213224
sqlite3 (~> 1.3)
214225
xcinvoke (~> 0.3.0)
215226
jmespath (1.6.2)
216-
json (2.6.3)
227+
json (2.7.1)
217228
jwt (2.7.0)
218229
liferaft (0.0.6)
219230
memoist (0.16.2)
220231
mini_magick (4.12.0)
221232
mini_mime (1.1.2)
222233
mini_portile2 (2.8.1)
223-
minitest (5.18.1)
234+
minitest (5.22.2)
224235
molinillo (0.8.0)
225236
multi_json (1.15.0)
226237
multipart-post (2.0.0)
227238
mustache (1.1.1)
239+
mutex_m (0.2.0)
228240
nanaimo (0.3.0)
229241
nap (1.1.0)
230242
naturally (2.2.1)
231243
netrc (0.11.0)
244+
nkf (0.2.0)
232245
open4 (1.3.4)
233246
optparse (0.1.1)
234247
os (1.1.4)
@@ -241,7 +254,7 @@ GEM
241254
trailblazer-option (>= 0.1.1, < 0.2.0)
242255
uber (< 0.2.0)
243256
retriable (3.1.2)
244-
rexml (3.2.5)
257+
rexml (3.2.6)
245258
rouge (2.0.7)
246259
ruby-macho (2.5.1)
247260
ruby2_keywords (0.0.5)
@@ -273,7 +286,7 @@ GEM
273286
tty-screen (0.8.1)
274287
tty-spinner (0.9.3)
275288
tty-cursor (~> 0.7)
276-
typhoeus (1.4.0)
289+
typhoeus (1.4.1)
277290
ethon (>= 0.9.0)
278291
tzinfo (2.0.6)
279292
concurrent-ruby (~> 1.0)
@@ -286,7 +299,7 @@ GEM
286299
word_wrap (1.0.0)
287300
xcinvoke (0.3.0)
288301
liferaft (~> 0.0.6)
289-
xcodeproj (1.22.0)
302+
xcodeproj (1.24.0)
290303
CFPropertyList (>= 2.3.3, < 4.0)
291304
atomos (~> 0.1.3)
292305
claide (>= 1.0.2, < 2.0)
@@ -302,7 +315,7 @@ PLATFORMS
302315
ruby
303316

304317
DEPENDENCIES
305-
cocoapods (~> 1.10)
318+
cocoapods (~> 1.14)
306319
fastlane
307320
jazzy (~> 0.14)
308321
snapshot

‎MapboxCoreNavigation.podspec

+2-2
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", "~> 182.0.0"
48-
s.dependency "MapboxDirections", "~> 2.11.1"
47+
s.dependency "MapboxNavigationNative", "~> 202.0.0"
48+
s.dependency "MapboxDirections", "~> 2.12.0"
4949

5050
s.swift_version = "5.5"
5151
end

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -24,44 +24,44 @@
2424
"repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
2525
"state": {
2626
"branch": null,
27-
"revision": "065cb97a83b8bf8d8584ab56cb6ebed898cc0c97",
28-
"version": "23.8.6"
27+
"revision": "ea67fe9b6ef4ee37e1d0bbc32752d46f3082dc61",
28+
"version": "23.9.0"
2929
}
3030
},
3131
{
3232
"package": "MapboxCoreMaps",
3333
"repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
3434
"state": {
3535
"branch": null,
36-
"revision": "798644dafccc37c3be17127e39638f39d6cd57e3",
37-
"version": "10.16.4"
36+
"revision": "00207cff55938601b4ce22e683cdc710fd8864e9",
37+
"version": "10.16.5"
3838
}
3939
},
4040
{
4141
"package": "MapboxDirections",
4242
"repositoryURL": "https://github.com/mapbox/mapbox-directions-swift.git",
4343
"state": {
4444
"branch": null,
45-
"revision": "3aaab4fb516638c51ec8a2e73cd2fabdb4588622",
46-
"version": "2.11.1"
45+
"revision": "dffb8fd7c8316ae8d9b79b694be933deba6f544e",
46+
"version": "2.12.0"
4747
}
4848
},
4949
{
5050
"package": "MapboxMaps",
5151
"repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
5252
"state": {
5353
"branch": null,
54-
"revision": "05a275f685ac95982716d87ccb677ebad417c252",
55-
"version": "10.16.4"
54+
"revision": "79af3be38640c4d60af167e9ee42754d832816e3",
55+
"version": "10.16.5"
5656
}
5757
},
5858
{
5959
"package": "MapboxNavigationNative",
6060
"repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
6161
"state": {
6262
"branch": null,
63-
"revision": "a8f1894703d5bf605979cfa81b6e0a43bcff53e9",
64-
"version": "182.0.0"
63+
"revision": "a40157f2b13108563a3b792d42c4fdcc2287cdcc",
64+
"version": "202.0.0"
6565
}
6666
},
6767
{

‎MapboxNavigation.podspec

+1-1
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.16.4"
47+
s.dependency "MapboxMaps", "~> 10.16.5"
4848
s.dependency "Solar-dev", "~> 3.0"
4949
s.dependency "MapboxSpeech", "~> 2.0"
5050

‎Package.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ let package = Package(
2222
)
2323
],
2424
dependencies: [
25-
.package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.11.1"),
26-
.package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "182.0.0"),
27-
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.16.4"),
25+
.package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", from: "2.12.0"),
26+
.package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "202.0.0"),
27+
.package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.16.5"),
2828
.package(name: "Solar", url: "https://github.com/ceeK/Solar.git", from: "3.0.0"),
2929
.package(name: "MapboxSpeech", url: "https://github.com/mapbox/mapbox-speech-swift.git", from: "2.0.0"),
3030
.package(name: "CwlPreconditionTesting", url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", from: "2.1.0"),

‎Sources/TestHelper/NavNative/TestNavigationStatusProvider.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public final class TestNavigationStatusProvider {
2424
let road = MapboxNavigationNative.RoadName(text: "name", language: "lang", imageBaseUrl: "base_image_url", shield: shield)
2525
let roadNames = roads ?? [road]
2626
let mapMatch = MapMatch(position: .init(edgeId: 0, percentAlong: 0), proba: 42)
27-
let mapMatcherOutput = MapMatcherOutput(matches: [mapMatch], isTeleport: false)
27+
let mapMatcherOutput = MapMatcherOutput(matches: [mapMatch], isTeleport: false, totalCandidatesCount: 1)
2828
return .init(routeState: routeState,
2929
locatedAlternativeRouteId: nil,
3030
primaryRouteId: nil,
@@ -54,6 +54,7 @@ public final class TestNavigationStatusProvider {
5454
nextWaypointIndex: 0,
5555
layer: nil,
5656
isSyntheticLocation: false,
57-
correctedLocationData: nil)
57+
correctedLocationData: nil,
58+
mapMatchedSystemTime: Date())
5859
}
5960
}

‎Tests/CocoaPodsTest/PodInstall/Podfile.lock

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
PODS:
2-
- MapboxCommon (23.8.6)
3-
- MapboxCoreMaps (10.16.4):
4-
- MapboxCommon (~> 23.8)
2+
- MapboxCommon (23.9.0)
3+
- MapboxCoreMaps (10.16.5):
4+
- MapboxCommon (~> 23.9)
55
- MapboxCoreNavigation (2.18.0-rc.2):
6-
- MapboxDirections (~> 2.11.1)
7-
- MapboxNavigationNative (~> 182.0.0)
8-
- MapboxDirections (2.11.1):
6+
- MapboxDirections (~> 2.12.0)
7+
- MapboxNavigationNative (~> 202.0.0)
8+
- MapboxDirections (2.12.0):
99
- Polyline (~> 5.0)
10-
- Turf (~> 2.6.1)
11-
- MapboxMaps (10.16.4):
12-
- MapboxCommon (= 23.8.6)
13-
- MapboxCoreMaps (= 10.16.4)
10+
- Turf (~> 2.7.0)
11+
- MapboxMaps (10.16.5):
12+
- MapboxCommon (= 23.9.0)
13+
- MapboxCoreMaps (= 10.16.5)
1414
- MapboxMobileEvents (= 1.0.10)
15-
- Turf (~> 2.0)
15+
- Turf (= 2.7.0)
1616
- MapboxMobileEvents (1.0.10)
1717
- MapboxNavigation (2.18.0-rc.2):
1818
- MapboxCoreNavigation (= 2.18.0-rc.2)
19-
- MapboxMaps (~> 10.16.4)
19+
- MapboxMaps (~> 10.16.5)
2020
- MapboxSpeech (~> 2.0)
2121
- Solar-dev (~> 3.0)
22-
- MapboxNavigationNative (182.0.0):
23-
- MapboxCommon (~> 23.8)
22+
- MapboxNavigationNative (202.0.0):
23+
- MapboxCommon (~> 23.9)
2424
- MapboxSpeech (2.1.1)
2525
- Polyline (5.1.0)
2626
- Solar-dev (3.0.1)
27-
- Turf (2.6.1)
27+
- Turf (2.7.0)
2828

2929
DEPENDENCIES:
3030
- MapboxCoreNavigation (from `../../../`)
@@ -50,19 +50,19 @@ EXTERNAL SOURCES:
5050
:path: "../../../"
5151

5252
SPEC CHECKSUMS:
53-
MapboxCommon: 90f76693dc02438acbb5ea9a5b266a4c0eb1c875
54-
MapboxCoreMaps: 7b07d1ca8c454a4381daf09df901b9d6bf90bce0
55-
MapboxCoreNavigation: e23646326ca7ba8c87c3fd1d68eb852a2333692a
56-
MapboxDirections: 31d61b8369d5dde6f6828f72905ab9a7e054cd2c
57-
MapboxMaps: cbb38845a9bf49b124f0e937975d560a4e01894e
53+
MapboxCommon: e89c490cccd7ea9efcdc0e74b4ce1dbd9b4a875a
54+
MapboxCoreMaps: 920f194f4f8b37f5731e0bdb82296d96ac4276f5
55+
MapboxCoreNavigation: bc5498a56c9e5c18ce9581ecc02ae47c1059e75e
56+
MapboxDirections: 4676f626df320732dcf74612223e568d39588320
57+
MapboxMaps: e8d94fb4782295df68172ce7ed567da8228c629e
5858
MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
59-
MapboxNavigation: 816011674ed85b8a44bc0d7127a778195b8e3e50
60-
MapboxNavigationNative: f2cbb7eddb712a541edb7f4c9ed286f02ede5c12
59+
MapboxNavigation: d0cf913d77373f14bdc414953f8ac38e7a284f85
60+
MapboxNavigationNative: 65bc7bdab133ee5c36a13c0d2b10d3c53e111073
6161
MapboxSpeech: cd25ef99c3a3d2e0da72620ff558276ea5991a77
6262
Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
6363
Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0
64-
Turf: 469ce2c3d22e5e8e4818d5a3b254699a5c89efa4
64+
Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2
6565

6666
PODFILE CHECKSUM: bde8103af0e9b326531ee57cf1fa935cbd5f2e18
6767

68-
COCOAPODS: 1.11.3
68+
COCOAPODS: 1.14.3

‎Tests/MapboxCoreNavigationTests/Progress/RouteProgressTests.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ class RouteProgressTests: TestCase {
335335
bannerInstruction: nil,
336336
speedLimit: .init(speed: nil, localeUnit: .kilometresPerHour, localeSign: .vienna),
337337
keyPoints: [],
338-
mapMatcherOutput: .init(matches: [], isTeleport: false),
338+
mapMatcherOutput: .init(matches: [], isTeleport: false, totalCandidatesCount: 0),
339339
offRoadProba: 0,
340340
offRoadStateProvider: .unknown,
341341
activeGuidanceInfo: .init(
@@ -347,7 +347,8 @@ class RouteProgressTests: TestCase {
347347
nextWaypointIndex: 0,
348348
layer: nil,
349349
isSyntheticLocation: false,
350-
correctedLocationData: nil
350+
correctedLocationData: nil,
351+
mapMatchedSystemTime: Date()
351352
)
352353
}
353354

0 commit comments

Comments
 (0)