From 26d4b4a3a37c414e0158e05a8ea0b9ed783dac9f Mon Sep 17 00:00:00 2001 From: Dmitry Volk Date: Fri, 18 Oct 2024 21:43:17 +0200 Subject: [PATCH] [ios] Bump dependencies for 3.5.0-beta.1 (#7027) --- Package.swift | 8 ++++---- .../CoreNavigator/DefaultRerouteControllerInterface.swift | 4 ++++ Sources/MapboxNavigationCore/Version.swift | 2 +- Sources/MapboxNavigationUIKit/Info.plist | 2 +- Sources/MapboxNavigationUIKit/Resources/MBXInfo.plist | 2 +- Sources/TestHelper/Info.plist | 2 +- Tests/MapboxNavigationPackageTests/Info.plist | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Package.swift b/Package.swift index 1eb0192dbd4..ca138830e09 100644 --- a/Package.swift +++ b/Package.swift @@ -3,8 +3,8 @@ import PackageDescription -let (navNativeVersion, navNativeChecksum, navNativeRevision) = ("320.0.0-SNAPSHOT.0927T1332Z.cd6ac90", "c461552f70edd1ca32481f7a8f0f7390749e69715ee6ac3c33ba039e45ca1934", "a4a7c3436e5aea99a01bae633d792e9fc4a86334") -let mapsVersion: Version = "11.7.0" +let (navNativeVersion, navNativeChecksum, navNativeRevision) = ("321.0.0-beta.1", "cf25ac7bc5a277e7d96f1a3081151a707634bcc3132d18262a74673c7c6f0710", "14c0ecc3181958d56de1e4209377510e7c43d29e") +let mapsVersion: Version = "11.8.0-beta.1" let package = Package( name: "MapboxNavigation", @@ -29,7 +29,7 @@ let package = Package( targets: ["MapboxDirectionsCLI"]), ], dependencies: [ - .package(url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", revision: navNativeRevision), + .package(url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", exact: Version(stringLiteral: navNativeVersion)), .package(url: "https://github.com/mapbox/mapbox-maps-ios.git", exact: mapsVersion), .package(url: "https://github.com/mapbox/turf-swift.git", exact: "3.0.0"), .package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.1.0"), @@ -141,4 +141,4 @@ let package = Package( .product(name: "ArgumentParser", package: "swift-argument-parser") ]), ] -) \ No newline at end of file +) diff --git a/Sources/MapboxNavigationCore/Navigator/Internals/CoreNavigator/DefaultRerouteControllerInterface.swift b/Sources/MapboxNavigationCore/Navigator/Internals/CoreNavigator/DefaultRerouteControllerInterface.swift index 24a413a4a71..c5f00f17d9f 100644 --- a/Sources/MapboxNavigationCore/Navigator/Internals/CoreNavigator/DefaultRerouteControllerInterface.swift +++ b/Sources/MapboxNavigationCore/Navigator/Internals/CoreNavigator/DefaultRerouteControllerInterface.swift @@ -22,4 +22,8 @@ class DefaultRerouteControllerInterface: RerouteControllerInterface { func cancel() { nativeInterface.cancel() } + + func setOptionsAdapterForRouteRequest(_ routeRequestOptionsAdapter: (any RouteOptionsAdapter)?) { + nativeInterface.setOptionsAdapterForRouteRequest(routeRequestOptionsAdapter) + } } diff --git a/Sources/MapboxNavigationCore/Version.swift b/Sources/MapboxNavigationCore/Version.swift index df1ddd6f952..af713f3b127 100644 --- a/Sources/MapboxNavigationCore/Version.swift +++ b/Sources/MapboxNavigationCore/Version.swift @@ -1,6 +1,6 @@ import Foundation extension Bundle { - public static let mapboxNavigationVersion: String = "3.4.0" + public static let mapboxNavigationVersion: String = "3.5.0-beta.1" public static let mapboxNavigationUXBundleIdentifier: String = "com.mapbox.navigationUX" } diff --git a/Sources/MapboxNavigationUIKit/Info.plist b/Sources/MapboxNavigationUIKit/Info.plist index d35f4c7e959..bfdcc5ed52d 100644 --- a/Sources/MapboxNavigationUIKit/Info.plist +++ b/Sources/MapboxNavigationUIKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.4.0 + 3.5.0 CFBundleVersion 1 NSPrincipalClass diff --git a/Sources/MapboxNavigationUIKit/Resources/MBXInfo.plist b/Sources/MapboxNavigationUIKit/Resources/MBXInfo.plist index 7a4efe4bd11..639ff4150af 100644 --- a/Sources/MapboxNavigationUIKit/Resources/MBXInfo.plist +++ b/Sources/MapboxNavigationUIKit/Resources/MBXInfo.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.4.0 + 3.5.0 CFBundleVersion 1 NSPrincipalClass diff --git a/Sources/TestHelper/Info.plist b/Sources/TestHelper/Info.plist index a5280f99ece..8a990d72ba5 100644 --- a/Sources/TestHelper/Info.plist +++ b/Sources/TestHelper/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.4.0 + 3.5.0 CFBundleVersion 1 diff --git a/Tests/MapboxNavigationPackageTests/Info.plist b/Tests/MapboxNavigationPackageTests/Info.plist index 0c3e234c600..a4b562488d2 100644 --- a/Tests/MapboxNavigationPackageTests/Info.plist +++ b/Tests/MapboxNavigationPackageTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.4.0 + 3.5.0 NSLocationAlwaysAndWhenInUseUsageDescription Location Usage Description NSLocationWhenInUseUsageDescription