Skip to content

Commit d75740d

Browse files
mapbox-github-ci-writer-4[bot]kried
authored and
github-actions[bot]
committed
[Backport release/v0.24] Prepare Nav iOS release 3.24.1 (#13708)
Backport of #13691 to `release/v0.24`. Cherry-picked commits: dce26d3a4204abe56dbb28ac9a31a2e0f84537fb --------- Co-authored-by: kried <kried.evad@gmail.com> GitOrigin-RevId: 0c21af72bce16b159129516a4d0a46eb3e021d5c
1 parent 9ced20c commit d75740d

26 files changed

Lines changed: 2676 additions & 2671 deletions

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Changes to the Mapbox Navigation SDK for iOS
22

3-
## 3.24.0
3+
## 3.24.1
4+
5+
### Packaging
6+
7+
* MapboxNavigationCore now requires [MapboxMaps v11.24.1](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v11.24.1)
8+
* MapboxNavigationCore now requires [MapboxNavigationNative v324.24.1](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/v324.24.1)
49

510
### Audio
611

‎Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import PackageDescription
55

6-
let (navNativeVersion, navNativeChecksum, navNativeRevision) = ("324.24.0-rc.1", "924276bf514c2cc61473ed8f93777797de5bd15563ce76890f72922e13903e73", "650e9c105d731c224d55d0cf519ffaf8f17daeea")
7-
let mapsVersion: Version = "11.24.0-rc.1"
6+
let (navNativeVersion, navNativeChecksum, navNativeRevision) = ("324.24.1", "88630ee02a4809039cc8df3df220e0b145987f891fd46b83ba79eedc65f327bc", "24d9a5e96cd1e5cd65d590a9250513019124115b")
7+
let mapsVersion: Version = "11.24.1"
88

99
let package = Package(
1010
name: "MapboxNavigation",

‎Sources/CarPlayTestHelper/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>3.24.0</string>
18+
<string>3.24.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>150</string>
2121
</dict>

‎Sources/MapboxNavigationCore/Version.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Foundation
22

33
extension Bundle {
4-
public static let mapboxNavigationVersion: String = "3.24.0-rc.1"
4+
public static let mapboxNavigationVersion: String = "3.24.1"
55
public static let mapboxNavigationUXBundleIdentifier: String = "com.mapbox.navigationUX"
66
}

‎Sources/MapboxNavigationUIKit/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>3.24.0</string>
18+
<string>3.24.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
<key>NSPrincipalClass</key>

‎Sources/MapboxNavigationUIKit/Resources/MBXInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>3.24.0</string>
18+
<string>3.24.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
<key>NSPrincipalClass</key>

‎Sources/TestHelper/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>3.24.0</string>
18+
<string>3.24.1</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
</dict>

‎Sources/_MapboxNavigationTestHelpers/Core/AlternativeRouteMock.swift‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,57 +5,57 @@ import MapboxNavigationNative_Private
55
import Turf
66

77
extension AlternativeRoute {
8-
// public static func mock(
9-
// mainRoute: Route = .mock(),
10-
// alternativeRoute: Route = .mock(shape: .mock(delta: (0.01, -0.01))),
11-
// nativeRouteAlternative: RouteAlternative? = nil,
12-
// requestOptions: ResponseOptions? = nil,
13-
// routeIndex: Int = 0
14-
// ) -> Self {
15-
// let nativeAlternative = nativeRouteAlternative ?? .mock(
16-
// mainRoute: mainRoute,
17-
// alternativeRoute: alternativeRoute,
18-
// routeIndex: routeIndex
19-
// )
20-
// let urlString = nativeAlternative.route.getRequestUri()
21-
// let requestOptions = requestOptions ?? .mock(routeOptions: .mock(string: urlString))
22-
// return self.init(
23-
// mainRoute: mainRoute,
24-
// alternativeRoute: alternativeRoute,
25-
// nativeRouteAlternative: nativeAlternative,
26-
// requestOptions: requestOptions
27-
// )!
28-
// }
8+
public static func mock(
9+
mainRoute: Route = .mock(),
10+
alternativeRoute: Route = .mock(shape: .mock(delta: (0.01, -0.01))),
11+
nativeRouteAlternative: RouteAlternative? = nil,
12+
requestOptions: ResponseOptions? = nil,
13+
routeIndex: Int = 0
14+
) -> Self {
15+
let nativeAlternative = nativeRouteAlternative ?? .mock(
16+
mainRoute: mainRoute,
17+
alternativeRoute: alternativeRoute,
18+
routeIndex: routeIndex
19+
)
20+
let urlString = nativeAlternative.route.getRequestUri()
21+
let requestOptions = requestOptions ?? .mock(routeOptions: .mock(string: urlString))
22+
return self.init(
23+
mainRoute: mainRoute,
24+
alternativeRoute: alternativeRoute,
25+
nativeRouteAlternative: nativeAlternative,
26+
requestOptions: requestOptions
27+
)!
28+
}
2929
}
3030

3131
extension RouteAlternative {
32-
// public static func mock(mainRoute: Route, alternativeRoute: Route, routeIndex: Int = 0) -> Self {
33-
// .mock(route: RouteInterfaceMock(
34-
// route: mainRoute,
35-
// alternativeRoute: alternativeRoute,
36-
// routeIndex: routeIndex
37-
// ))
38-
// }
39-
//
40-
// public static func mock(
41-
// id: UInt32 = 0,
42-
// route: RouteInterface = RouteInterfaceMock(),
43-
// mainRouteFork: RouteIntersection = .mock(),
44-
// alternativeRouteFork: RouteIntersection = .mock(),
45-
// infoFromFork: AlternativeRouteInfo = .mock(),
46-
// infoFromStart: AlternativeRouteInfo = .mock(),
47-
// isNew: Bool = true
48-
// ) -> Self {
49-
// self.init(
50-
// id: id,
51-
// route: route,
52-
// mainRouteFork: mainRouteFork,
53-
// alternativeRouteFork: alternativeRouteFork,
54-
// infoFromFork: infoFromFork,
55-
// infoFromStart: infoFromStart,
56-
// isNew: isNew
57-
// )
58-
// }
32+
public static func mock(mainRoute: Route, alternativeRoute: Route, routeIndex: Int = 0) -> Self {
33+
.mock(route: RouteInterfaceMock(
34+
route: mainRoute,
35+
alternativeRoute: alternativeRoute,
36+
routeIndex: routeIndex
37+
))
38+
}
39+
40+
public static func mock(
41+
id: UInt32 = 0,
42+
route: RouteInterface = RouteInterfaceMock(),
43+
mainRouteFork: RouteIntersection = .mock(),
44+
alternativeRouteFork: RouteIntersection = .mock(),
45+
infoFromFork: AlternativeRouteInfo = .mock(),
46+
infoFromStart: AlternativeRouteInfo = .mock(),
47+
isNew: Bool = true
48+
) -> Self {
49+
self.init(
50+
id: id,
51+
route: route,
52+
mainRouteFork: mainRouteFork,
53+
alternativeRouteFork: alternativeRouteFork,
54+
infoFromFork: infoFromFork,
55+
infoFromStart: infoFromStart,
56+
isNew: isNew
57+
)
58+
}
5959
}
6060

6161
extension RouteIntersection {

‎Sources/_MapboxNavigationTestHelpers/Core/Environment/Environment+Extensions.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
@testable import MapboxNavigationCore
22

33
extension MapboxNavigationCore.Environment {
4-
// public static let noop = Environment(
5-
// audioPlayerClient: .noopValue,
6-
// routerClientProvider: .noopValue,
7-
// routeParserClient: .noopValue,
8-
// speechSynthesizerClientProvider: .noopValue
9-
// )
4+
public static let noop = Environment(
5+
audioPlayerClient: .noopValue,
6+
routerClientProvider: .noopValue,
7+
routeParserClient: .noopValue,
8+
speechSynthesizerClientProvider: .noopValue
9+
)
1010

1111
public static let test = Environment(
1212
audioPlayerClient: .testValue,

‎Sources/_MapboxNavigationTestHelpers/Core/Environment/RouteParserClient+Extensions.swift‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ import MapboxCommon_Private
33
import MapboxNavigationNative_Private
44

55
extension RouteParserClient {
6-
// public static var noopValue: RouteParserClient {
7-
// Self(
8-
// createRoutesData: { _, _ in
9-
// return RoutesDataMock()
10-
// },
11-
// parseDirectionsRoutesForResponse: { _, _, _ in
12-
// return Expected<NSArray, NSString>(value: [])
13-
// },
14-
// parseDirectionsRoutesForResponseWithCallback: { _, _, _, _ in },
15-
// parseDirectionsResponseForResponseDataRef: { _, _, _ in
16-
// return Expected<NSArray, NSString>(value: [])
17-
// },
18-
// parseDirectionsResponseForResponseDataRefWithCallback: { _, _, _, _ in },
19-
// parseMapMatchingResponseForResponseDataRef: { _, _, _ in
20-
// return Expected<NSArray, NSString>(value: [])
21-
// },
22-
// parseMapMatchingResponseForResponseDataRefWithCallback: { _, _, _, _ in }
23-
// )
24-
// }
6+
public static var noopValue: RouteParserClient {
7+
Self(
8+
createRoutesData: { _, _ in
9+
return RoutesDataMock()
10+
},
11+
parseDirectionsRoutesForResponse: { _, _, _ in
12+
return Expected<NSArray, NSString>(value: [])
13+
},
14+
parseDirectionsRoutesForResponseWithCallback: { _, _, _, _ in },
15+
parseDirectionsResponseForResponseDataRef: { _, _, _ in
16+
return Expected<NSArray, NSString>(value: [])
17+
},
18+
parseDirectionsResponseForResponseDataRefWithCallback: { _, _, _, _ in },
19+
parseMapMatchingResponseForResponseDataRef: { _, _, _ in
20+
return Expected<NSArray, NSString>(value: [])
21+
},
22+
parseMapMatchingResponseForResponseDataRefWithCallback: { _, _, _, _ in }
23+
)
24+
}
2525
}
2626

2727
extension RouteParserClient {

0 commit comments

Comments
 (0)