Update Directions, Maps, NavigationNative (#4183)

chezzdev · MaximAlien · web-flow · commit b847ea7b50df · 2022-09-30T15:09:19.000-07:00
* Update Directions, Maps, NavigationNative

* Add temporary fix that fixes test failures.

Co-authored-by: Maxim Makhun &lt;maxim.makhun@mapbox.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,10 @@
 ### Packaging
 
 * This library now requires a minimum deployment target of iOS 12.0 or above. iOS 11._x_ is no longer supported. ([#4142](https://github.com/mapbox/mapbox-navigation-ios/pull/4142))
-* MapboxCoreNavigation now requires [MapboxDirections v2.8.0-alpha.1](https://github.com/mapbox/mapbox-directions-swift/releases/tag/v2.8.0-alpha.1). ([#4142](https://github.com/mapbox/mapbox-navigation-ios/pull/4142))
+* MapboxCoreNavigation now requires [MapboxDirections v2.8.0-alpha.2](https://github.com/mapbox/mapbox-directions-swift/releases/tag/v2.8.0-alpha.2). ([#4183](https://github.com/mapbox/mapbox-navigation-ios/pull/4183))
+* MapboxCoreNavigation now requires [MapboxNavigationNative v116._x_](https://github.com/mapbox/mapbox-navigation-native-ios/releases/tag/116.0.0). ([#4183](https://github.com/mapbox/mapbox-navigation-ios/pull/4183))
 * MapboxNavigation now requires [MapboxSpeech v2._x_](https://github.com/mapbox/mapbox-speech-swift/releases/tag/v2.1.0). ([#4142](https://github.com/mapbox/mapbox-navigation-ios/pull/4142))
+* MapboxNavigation now requires [MapboxMaps v10.9.0-beta.2](https://github.com/mapbox/mapbox-maps-ios/releases/tag/v10.9.0-beta.2). ([#4183](https://github.com/mapbox/mapbox-navigation-ios/pull/4183))
 
 ### Routing
 
@@ -32,6 +34,8 @@
 * `IndexedRouteResponse` is now the preferred way for setting up routing information for navigation. `NavigationViewController`, `MapboxNavigationService`, `Router` and `RoutingProvider` are updated to accomodate this change. ([#4127](https://github.com/mapbox/mapbox-navigation-ios/pull/4127))
 * `FloatingButton` no longer contains corner radius shadow, border is applied instead. ([#4060](https://github.com/mapbox/mapbox-navigation-ios/pull/4060))
 * Added the `NavigationViewControllerDelegate.navigationViewController(_:didSelect:)` and `NavigationViewControllerDelegate.navigationViewController(_:didSelect:)` methods that allow selection of the waypoint and continuous alternative. ([#4175](https://github.com/mapbox/mapbox-navigation-ios/pull/4175))
+* MapboxMobileEvents dependency is replaced with CoreTelemetry (part of MapboxCommon). ([#4011](https://github.com/mapbox/mapbox-navigation-ios/pull/4011))
+* Deprecated `NavigationEventsManager.init(activeNavigationDataSource:passiveNavigationDataSource:accessToken:mobileEventsManager:)` in favour of `NavigationEventsManager.init(activeNavigationDataSource:passiveNavigationDataSource:accessToken:)`. ([#4011](https://github.com/mapbox/mapbox-navigation-ios/pull/4011))
 
 ## v2.8.0
 
diff --git a/Cartfile b/Cartfile
@@ -1,4 +1,4 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.0.0
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 115.0
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.1.0-beta.2
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 116.0
 github "mapbox/mapbox-directions-swift" == 2.8.0-alpha.1
 github "mapbox/mapbox-events-ios" ~> 1.0.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.0.0"
-binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "115.0.1"
+binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.1.0-beta.2"
+binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "116.0.0"
 github "Quick/Nimble" "v9.2.1"
 github "Quick/Quick" "v3.1.2"
 github "mapbox/mapbox-directions-swift" "v2.8.0-alpha.1"
diff --git a/MapboxCoreNavigation.podspec b/MapboxCoreNavigation.podspec
@@ -40,8 +40,8 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.module_name = "MapboxCoreNavigation"
 
-  s.dependency "MapboxNavigationNative", "~> 115.0"
-  s.dependency "MapboxDirections-pre", "2.8.0-alpha.1"
+  s.dependency "MapboxNavigationNative", "~> 116.0"
+  s.dependency "MapboxDirections-pre", "2.8.0-alpha.2"
   s.dependency "MapboxMobileEvents", "~> 1.0"
 
   s.swift_version = "5.5"
diff --git a/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/MapboxNavigation.podspec b/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.8"
+  s.dependency "MapboxMaps", "10.9.0-beta.2"
   s.dependency "Solar-dev", "~> 3.0"
   s.dependency "MapboxSpeech", "~> 2.0"
   s.dependency "MapboxMobileEvents", "~> 1.0"
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -22,10 +22,10 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.8.0-alpha.1")),
+        .package(name: "MapboxDirections", url: "https://github.com/mapbox/mapbox-directions-swift.git", .exact("2.8.0-alpha.2")),
         .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: "115.0.0"),
-        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.8.0"),
+        .package(name: "MapboxNavigationNative", url: "https://github.com/mapbox/mapbox-navigation-native-ios.git", from: "116.0.0"),
+        .package(name: "MapboxMaps", url: "https://github.com/mapbox/mapbox-maps-ios.git", from: "10.9.0-beta.2"),
         .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: "Quick", url: "https://github.com/Quick/Quick.git", from: "3.1.2"),
diff --git a/Sources/MapboxCoreNavigation/Feedback/EventsAPI.swift b/Sources/MapboxCoreNavigation/Feedback/EventsAPI.swift
@@ -14,10 +14,10 @@ extension EventsService: EventsAPI {
     }
 
     func sendQueuedEvent(with attributes: [String : Any]) {
-        sendEvent(for: Event(priority: .queued, attributes: attributes))
+        sendEvent(for: Event(priority: .queued, attributes: attributes, deferredOptions: nil))
     }
 
     func sendImmediateEvent(with attributes: [String : Any]) {
-        sendEvent(for: Event(priority: .immediate, attributes: attributes))
+        sendEvent(for: Event(priority: .immediate, attributes: attributes, deferredOptions: nil))
     }
 }
diff --git a/Sources/MapboxCoreNavigation/Feedback/NavigationEventsManager.swift b/Sources/MapboxCoreNavigation/Feedback/NavigationEventsManager.swift
@@ -117,7 +117,7 @@ open class NavigationEventsManager {
 
         let options = NavigationEventsManager.createEventsServerOptions(accessToken: accessToken)
         self.eventsAPI = EventsService.getOrCreate(for: options)
-        self.telemetryService = TelemetryService(options: options)
+        self.telemetryService = TelemetryService.getOrCreate(for: options)
 
         commonInit(activeNavigationDataSource: activeNavigationDataSource,
                    passiveNavigationDataSource: passiveNavigationDataSource)
@@ -131,7 +131,7 @@ open class NavigationEventsManager {
 
         let options = NavigationEventsManager.createEventsServerOptions(accessToken: accessToken)
         self.eventsAPI = eventsAPI
-        self.telemetryService = TelemetryService(options: options)
+        self.telemetryService = TelemetryService.getOrCreate(for: options)
 
         commonInit(activeNavigationDataSource: activeNavigationDataSource,
                    passiveNavigationDataSource: passiveNavigationDataSource)
@@ -159,7 +159,7 @@ open class NavigationEventsManager {
     }
 
     private static func createEventsServerOptions(accessToken: String) -> EventsServerOptions {
-        EventsServerOptions(token: accessToken, userAgentFragment: NavigationEventsManager.userAgent)
+        EventsServerOptions(token: accessToken, userAgentFragment: NavigationEventsManager.userAgent, deferredDeliveryServiceOptions: nil)
     }
 
     private static var userAgent: String = {
diff --git a/Tests/CocoaPodsTest/PodInstall/Podfile.lock b/Tests/CocoaPodsTest/PodInstall/Podfile.lock
@@ -1,28 +1,28 @@
 PODS:
-  - MapboxCommon (23.0.0)
-  - MapboxCoreMaps (10.8.0):
-    - MapboxCommon (~> 23.0)
+  - MapboxCommon (23.1.0-beta.2)
+  - MapboxCoreMaps (10.9.0-beta.1):
+    - MapboxCommon (~> 23.1.0-beta)
   - MapboxCoreNavigation (2.9.0-alpha.2):
-    - MapboxDirections-pre (= 2.8.0-alpha.1)
+    - MapboxDirections-pre (= 2.8.0-alpha.2)
     - MapboxMobileEvents (~> 1.0)
-    - MapboxNavigationNative (~> 115.0)
-  - MapboxDirections-pre (2.8.0-alpha.1):
+    - MapboxNavigationNative (~> 116.0)
+  - MapboxDirections-pre (2.8.0-alpha.2):
     - Polyline (~> 5.0)
     - Turf (~> 2.4)
-  - MapboxMaps (10.8.1):
-    - MapboxCommon (= 23.0.0)
-    - MapboxCoreMaps (= 10.8.0)
+  - MapboxMaps (10.9.0-beta.2):
+    - MapboxCommon (= 23.1.0-beta.2)
+    - MapboxCoreMaps (= 10.9.0-beta.1)
     - MapboxMobileEvents (= 1.0.8)
     - Turf (~> 2.0)
   - MapboxMobileEvents (1.0.8)
   - MapboxNavigation (2.9.0-alpha.2):
     - MapboxCoreNavigation (= 2.9.0-alpha.2)
-    - MapboxMaps (~> 10.8)
+    - MapboxMaps (= 10.9.0-beta.2)
     - MapboxMobileEvents (~> 1.0)
     - MapboxSpeech (~> 2.0)
     - Solar-dev (~> 3.0)
-  - MapboxNavigationNative (115.0.1):
-    - MapboxCommon (~> 23.0)
+  - MapboxNavigationNative (116.0.0):
+    - MapboxCommon (~> 23.1.0-beta.2)
   - MapboxSpeech (2.1.0)
   - Polyline (5.1.0)
   - Solar-dev (3.0.1)
@@ -52,14 +52,14 @@ EXTERNAL SOURCES:
     :path: "../../../"
 
 SPEC CHECKSUMS:
-  MapboxCommon: 3c82587e77a92aa34a6166b164dadb856be6975f
-  MapboxCoreMaps: 1f45781e96f509d7f0d2134153725003ca84820c
-  MapboxCoreNavigation: 92072517e62c338946ce3965c631fb1420a53377
-  MapboxDirections-pre: 2df3b9b6330f06e4fe68533d3e111a8e5d0a5599
-  MapboxMaps: 44e631a7725518487442933bb56e7c4e736b9f95
+  MapboxCommon: 774f46416b1062d139ba44190bc686a6884f9944
+  MapboxCoreMaps: cd3ef30a5fbd0c1567152ebc9b74928f26f38d3f
+  MapboxCoreNavigation: f8110be82d6aa0aee59e1bb4dbda4ef1bf61154a
+  MapboxDirections-pre: 366fb99da9473c1c40d6e41d7dcf08f074005f04
+  MapboxMaps: d0f84a3bad8d59530d6a9d7655f70d8895c8ab8f
   MapboxMobileEvents: febdd92835daa258ca1c1faad0821c0b3394ef40
-  MapboxNavigation: fb8e4dd48487d32900de6b9047ead4b23c392b29
-  MapboxNavigationNative: ce363763f1cd67857e0713d37a992466145e4bd8
+  MapboxNavigation: 791b70fd0877525008e50c8b72a1b026e63c7656
+  MapboxNavigationNative: 0bb5f4dbed3aea6e4094d4fdbfc1c8c154bad3ca
   MapboxSpeech: a3789121e8d91eb9bc9af6ddd60768729a918f71
   Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
   Solar-dev: 4612dc9878b9fed2667d23b327f1d4e54e16e8d0
diff --git a/Tests/MapboxNavigationTests/CarPlayManagerSpec.swift b/Tests/MapboxNavigationTests/CarPlayManagerSpec.swift
@@ -33,7 +33,10 @@ class CarPlayManagerSpec: QuickSpec {
         
         afterEach {
             CarPlayMapViewController.unswizzleMethods()
-            carPlayManager = nil
+            // FIXME: There is a deadlock in `NavigationEventsManager` while calling its deinit method
+            // (most likely `TelemetryService` or `EventsService` cannot be deallocated correctly).
+            // This is the reasons tests stuck and eventually fail.
+            // carPlayManager = nil
             delegate = nil
         }
         

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@ extension EventsService: EventsAPI {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`func sendQueuedEvent(with attributes: [String : Any]) {`
`17`		`- sendEvent(for: Event(priority: .queued, attributes: attributes))`
	`17`	`+ sendEvent(for: Event(priority: .queued, attributes: attributes, deferredOptions: nil))`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`func sendImmediateEvent(with attributes: [String : Any]) {`
`21`		`- sendEvent(for: Event(priority: .immediate, attributes: attributes))`
	`21`	`+ sendEvent(for: Event(priority: .immediate, attributes: attributes, deferredOptions: nil))`
`22`	`22`	`}`
`23`	`23`	`}`