Update dependencies

.breakage-allowlist

@@ -1 +1,3 @@
-EnumElement RoadObject.Kind.notification has been added as a new enum case
+EnumElement RoadObject.Kind.notification has been added as a new enum case
+Func Directions.calculateOffline(options:completionHandler:) is no longer open for subclassing
+Func Directions.calculateWithCache(options:completionHandler:) is no longer open for subclassing

.circleci/config.yml

@@ -283,12 +283,9 @@ jobs:
       update:
         type: boolean
         default: false
-      iOS:
-        type: string
-        default: "15.2"
       xcode:
         type: string
-        default: "13.2.1"
+        default: "14.2.0"
       lint:
         type: boolean
         default: false
@@ -297,6 +294,7 @@ jobs:
         default: false
     macos:
       xcode: << parameters.xcode >>
+    resource_class: macos.x86.medium.gen2
     environment:
       HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
@@ -316,11 +314,11 @@ jobs:
           condition: << parameters.update >>
           steps:
             - run: cd Tests/CocoaPodsTest/PodInstall && bundle exec pod install --repo-update
-      - run: cd Tests/CocoaPodsTest/PodInstall && xcodebuild -workspace PodInstall.xcworkspace -scheme PodInstall -destination 'platform=iOS Simulator,OS=<< parameters.iOS >>,name=iPhone 13 Pro Max' clean build
+      - run: cd Tests/CocoaPodsTest/PodInstall && xcodebuild -workspace PodInstall.xcworkspace -scheme PodInstall -destination 'generic/platform=iOS Simulator' -sdk iphonesimulator clean build
       - when:
           condition: << parameters.archive >>
           steps:
-            - run: cd Tests/CocoaPodsTest/PodInstall && xcodebuild -workspace PodInstall.xcworkspace -scheme PodInstall -sdk iphoneos<< parameters.iOS >> -destination generic/platform=iOS clean archive CODE_SIGNING_ALLOWED="NO"
+            - run: cd Tests/CocoaPodsTest/PodInstall && xcodebuild -workspace PodInstall.xcworkspace -scheme PodInstall -destination 'generic/platform=iOS Simulator' -sdk iphonesimulator clean archive CODE_SIGNING_ALLOWED="NO"
       - when:
           condition: << parameters.lint >>
           steps:
@@ -891,17 +889,15 @@ workflows:
             codecoverage: false
             context: Slack Orb
         - pod-job:
-            name: "Xcode_13.2.1_iOS_15.2_CP_install"
+            name: "Xcode_14.2.0 pod install"
             update: false
-            xcode: "13.2.1"
-            iOS: "15.2"
+            xcode: "14.2.0"
             archive: true
             context: Slack Orb
         - pod-job:
-            name: "Xcode_13.2.1_iOS_15.2_CP_update"
+            name: "Xcode_14.3 pod update"
             update: true
-            xcode: "13.2.1"
-            iOS: "15.2"
+            xcode: "14.3.1"
             lint: true
             context: Slack Orb
         - build-example:

Cartfile

@@ -1,4 +1,4 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.6.0-beta.1
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 134.0.0
-github "mapbox/mapbox-directions-swift" == 2.11.0-rc.1
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.6.0-rc.1
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 136.0.0
+github "mapbox/mapbox-directions-swift" ~= 2.10.0
 github "mapbox/mapbox-events-ios" ~> 1.0.0

Cartfile.resolved

@@ -1,6 +1,6 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.6.0-beta.1"
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "134.0.0"
-github "mapbox/mapbox-directions-swift" "v2.11.0-rc.1"
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.6.0-rc.1"
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "136.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"
 github "mattgallagher/CwlPreconditionTesting" "2.1.2"

MapboxCoreNavigation.podspec

@@ -44,8 +44,8 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.module_name = "MapboxCoreNavigation"
 
-  s.dependency "MapboxNavigationNative", "~> 134.0.0"
-  s.dependency "MapboxDirections-pre", "2.11.0-rc.1"
+  s.dependency "MapboxNavigationNative", "~> 136.0.0"
+  s.dependency "MapboxDirections", "~> 2.10.0"
   s.dependency "MapboxMobileEvents", "~> 1.0"
 
   s.swift_version = "5.5"

MapboxNavigation-SPM.xcodeproj/project.pbxproj

@@ -453,7 +453,6 @@
 				358D145F1E5E3B7700ADE590 /* Sources */,
 				358D14601E5E3B7700ADE590 /* Frameworks */,
 				358D14611E5E3B7700ADE590 /* Resources */,
-				DA408F661FB3CA3C004D9661 /* Apply Mapbox Access Token */,
 			);
 			buildRules = (
 			);
@@ -559,7 +558,6 @@
 				C53F2EE320EBC95600D9798F /* Sources */,
 				C53F2EE920EBC95600D9798F /* Frameworks */,
 				C53F2EF220EBC95600D9798F /* Resources */,
-				C53F2F0320EBC95600D9798F /* Apply Mapbox Access Token */,
 			);
 			buildRules = (
 			);
@@ -803,38 +801,6 @@
 			shellPath = /bin/sh;
 			shellScript = "# This Run Script build phase helps to keep the navigation SDK’s developers from exposing their own access tokens during development. See <https://www.mapbox.com/help/ios-private-access-token/> for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.\n\ntoken_file=~/.mapbox\ntoken_file2=~/mapbox\ntoken=\"$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null)\"\nif [ \"$token\" ]; then\n  plutil -replace MBXAccessToken -string $token \"$TARGET_BUILD_DIR/$INFOPLIST_PATH\"\nelse\n  echo 'warning: Missing Mapbox access token'\n  open 'https://www.mapbox.com/account/access-tokens/'\n  echo \"warning: Get an access token from <https://www.mapbox.com/account/access-tokens/>, then create a new file at $token_file or $token_file2 that contains the access token.\"\nfi\n";
 		};
-		C53F2F0320EBC95600D9798F /* Apply Mapbox Access Token */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(TARGET_BUILD_DIR)/$(INFOPLIST_PATH)",
-			);
-			name = "Apply Mapbox Access Token";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# This Run Script build phase helps to keep the navigation SDK’s developers from exposing their own access tokens during development. See <https://www.mapbox.com/help/ios-private-access-token/> for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.\n\ntoken_file=~/.mapbox\ntoken_file2=~/mapbox\ntoken=\"$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null)\"\nif [ \"$token\" ]; then\n  plutil -replace MBXAccessToken -string $token \"$TARGET_BUILD_DIR/$INFOPLIST_PATH\"\nelse\n  echo 'warning: Missing Mapbox access token'\n  open 'https://www.mapbox.com/account/access-tokens/'\n  echo \"warning: Get an access token from <https://www.mapbox.com/account/access-tokens/>, then create a new file at $token_file or $token_file2 that contains the access token.\"\nfi\n";
-		};
-		DA408F661FB3CA3C004D9661 /* Apply Mapbox Access Token */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(TARGET_BUILD_DIR)/$(INFOPLIST_PATH)",
-			);
-			name = "Apply Mapbox Access Token";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# This Run Script build phase helps to keep the navigation SDK’s developers from exposing their own access tokens during development. See <https://www.mapbox.com/help/ios-private-access-token/> for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.\n\ntoken_file=~/.mapbox\ntoken_file2=~/mapbox\ntoken=\"$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null)\"\nif [ \"$token\" ]; then\n  plutil -replace MBXAccessToken -string $token \"$TARGET_BUILD_DIR/$INFOPLIST_PATH\"\nelse\n  echo 'warning: Missing Mapbox access token'\n  open 'https://www.mapbox.com/account/access-tokens/'\n  echo \"warning: Get an access token from <https://www.mapbox.com/account/access-tokens/>, then create a new file at $token_file or $token_file2 that contains the access token.\"\nfi\n";
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

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

@@ -24,26 +24,26 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
         "state": {
           "branch": null,
-          "revision": "85e5d1ff4476de9ce02b61a74a20324ccf1bf763",
-          "version": "23.6.0-beta.1"
+          "revision": "a2da00dbce18713b6533a85504ddb940df082478",
+          "version": "23.6.0-rc.1"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "04be2a9940bbb5ae84fa13add4704ab3b0eb5960",
-          "version": "10.14.0-beta.1"
+          "revision": "d6918f8c1ef527afbc358a62ca4d5080eb33c5d4",
+          "version": "10.14.0-rc.1"
         }
       },
       {
         "package": "MapboxDirections",
         "repositoryURL": "https://github.com/mapbox/mapbox-directions-swift.git",
         "state": {
           "branch": null,
-          "revision": "1061623d294c47657e029f1105c3c3aa44ca1f8a",
-          "version": "2.11.0-rc.1"
+          "revision": "edcc5b30009e784f17c1cced1075878eaf781187",
+          "version": "2.10.0"
         }
       },
       {
@@ -60,17 +60,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "b6e67c9502b8aaee661302ca0b5d39256920f188",
-          "version": "10.14.0-beta.1"
+          "revision": "371730a52be52af5ed9143515f816889e1ffefb4",
+          "version": "10.14.0-rc.1"
         }
       },
       {
         "package": "MapboxNavigationNative",
         "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
         "state": {
           "branch": null,
-          "revision": "e6b84a77030c5cc328065771caf88873727962fd",
-          "version": "134.0.0"
+          "revision": "ff11ecf5651a4fdd9144d96671fc6a22637c2049",
+          "version": "136.0.0"
         }
       },
       {

MapboxNavigation-SPM.xcodeproj/xcshareddata/xcschemes/Example-CarPlay.xcscheme

@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1400"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PostActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "# This Run Script build phase helps to keep the navigation SDK&#x2019;s developers from exposing their own access tokens during development. See &lt;https://www.mapbox.com/help/ios-private-access-token/&gt; for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.&#10;&#10;if [ -f &quot;${TARGET_BUILD_DIR}/${INFOPLIST_PATH}&quot; ]; then&#10;  token_file=~/.mapbox&#10;  token_file2=~/mapbox&#10;  token=&quot;$(cat $token_file 2&gt;/dev/null || cat $token_file2 2&gt;/dev/null)&quot;&#10;  if [ &quot;$token&quot; ]; then&#10;    plutil -replace MBXAccessToken -string $token &quot;$TARGET_BUILD_DIR/$INFOPLIST_PATH&quot;&#10;  else&#10;    echo &apos;warning: Missing Mapbox access token&apos;&#10;    open &apos;https://www.mapbox.com/account/access-tokens/&apos;&#10;    echo &quot;warning: Get an access token from &lt;https://www.mapbox.com/account/access-tokens/&gt;, then create a new file at $token_file or $token_file2 that contains the access token.&quot;&#10;  fi&#10;fi&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "C53F2EDE20EBC95600D9798F"
+                     BuildableName = "Example.app"
+                     BlueprintName = "Example-CarPlay"
+                     ReferencedContainer = "container:MapboxNavigation-SPM.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PostActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

MapboxNavigation-SPM.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1400"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PostActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "# This Run Script build phase helps to keep the navigation SDK&#x2019;s developers from exposing their own access tokens during development. See &lt;https://www.mapbox.com/help/ios-private-access-token/&gt; for more information. If you are developing an application privately, you may add the MBXAccessToken key directly to your Info.plist file and delete this build phase.&#10;&#10;if [ -f &quot;${TARGET_BUILD_DIR}/${INFOPLIST_PATH}&quot; ]; then&#10;  token_file=~/.mapbox&#10;  token_file2=~/mapbox&#10;  token=&quot;$(cat $token_file 2&gt;/dev/null || cat $token_file2 2&gt;/dev/null)&quot;&#10;  if [ &quot;$token&quot; ]; then&#10;    plutil -replace MBXAccessToken -string $token &quot;$TARGET_BUILD_DIR/$INFOPLIST_PATH&quot;&#10;  else&#10;    echo &apos;warning: Missing Mapbox access token&apos;&#10;    open &apos;https://www.mapbox.com/account/access-tokens/&apos;&#10;    echo &quot;warning: Get an access token from &lt;https://www.mapbox.com/account/access-tokens/&gt;, then create a new file at $token_file or $token_file2 that contains the access token.&quot;&#10;  fi&#10;fi&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "358D14621E5E3B7700ADE590"
+                     BuildableName = "Example.app"
+                     BlueprintName = "Example"
+                     ReferencedContainer = "container:MapboxNavigation-SPM.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PostActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

MapboxNavigation.podspec

@@ -44,7 +44,7 @@ Pod::Spec.new do |s|
   s.module_name = "MapboxNavigation"
 
   s.dependency "MapboxCoreNavigation", "#{s.version.to_s}"
-  s.dependency "MapboxMaps", "10.14.0-beta.1"
+  s.dependency "MapboxMaps", "10.14.0-rc.1"
   s.dependency "Solar-dev", "~> 3.0"
   s.dependency "MapboxSpeech", "~> 2.0"
   s.dependency "MapboxMobileEvents", "~> 1.0"

Package.resolved

@@ -24,26 +24,26 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
         "state": {
           "branch": null,
-          "revision": "85e5d1ff4476de9ce02b61a74a20324ccf1bf763",
-          "version": "23.6.0-beta.1"
+          "revision": "a2da00dbce18713b6533a85504ddb940df082478",
+          "version": "23.6.0-rc.1"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "04be2a9940bbb5ae84fa13add4704ab3b0eb5960",
-          "version": "10.14.0-beta.1"
+          "revision": "d6918f8c1ef527afbc358a62ca4d5080eb33c5d4",
+          "version": "10.14.0-rc.1"
         }
       },
       {
         "package": "MapboxDirections",
         "repositoryURL": "https://github.com/mapbox/mapbox-directions-swift.git",
         "state": {
           "branch": null,
-          "revision": "1061623d294c47657e029f1105c3c3aa44ca1f8a",
-          "version": "2.11.0-rc.1"
+          "revision": "edcc5b30009e784f17c1cced1075878eaf781187",
+          "version": "2.10.0"
         }
       },
       {
@@ -60,17 +60,17 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "b6e67c9502b8aaee661302ca0b5d39256920f188",
-          "version": "10.14.0-beta.1"
+          "revision": "371730a52be52af5ed9143515f816889e1ffefb4",
+          "version": "10.14.0-rc.1"
         }
       },
       {
         "package": "MapboxNavigationNative",
         "repositoryURL": "https://github.com/mapbox/mapbox-navigation-native-ios.git",
         "state": {
           "branch": null,
-          "revision": "e6b84a77030c5cc328065771caf88873727962fd",
-          "version": "134.0.0"
+          "revision": "ff11ecf5651a4fdd9144d96671fc6a22637c2049",
+          "version": "136.0.0"
         }
       },
       {

Package.swift

@@ -22,10 +22,10 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.11.0-rc.1")),
+        .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: "134.0.0"),
-        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.14.0-beta.1")),
+        .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "136.0.0"),
+        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", .exact("10.14.0-rc.1")),
         .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"),

Sources/MapboxCoreNavigation/Directions.swift

@@ -16,7 +16,7 @@ extension Directions {
      - parameter completionHandler: The closure (block) to call with the resulting routes. This closure is executed on the application’s main thread.
      - returns: The data task used to perform the HTTP request. If, while waiting for the completion handler to execute, you no longer want the resulting routes, cancel this task.
      */
-    @discardableResult open func calculateWithCache(options: RouteOptions, completionHandler: @escaping IndexedRouteResponseCompletionHandler) -> URLSessionDataTask? {
+    @discardableResult public func calculateWithCache(options: RouteOptions, completionHandler: @escaping IndexedRouteResponseCompletionHandler) -> URLSessionDataTask? {
         return calculate(options) { (session, result) in
             switch result {
             case .success(let routeResponse):
@@ -74,7 +74,7 @@ extension Directions {
      - parameter options: A `RouteOptions` object specifying the requirements for the resulting routes.
      - parameter completionHandler: The closure (block) to call with the resulting routes. This closure is executed on the application’s main thread.
      */
-    open func calculateOffline(options: RouteOptions, completionHandler: @escaping IndexedRouteResponseCompletionHandler) {
+    public func calculateOffline(options: RouteOptions, completionHandler: @escaping IndexedRouteResponseCompletionHandler) {
         MapboxRoutingProvider(.offline).calculateRoutes(options: options,
                                                         completionHandler: completionHandler)
     }