diff --git a/CHANGELOG.md b/CHANGELOG.md index bb5e82a96f..8dc289775d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Packaging * This library can no longer be used in applications written in pure Objective-C. If you need to use this library’s public API from Objective-C code, you will need to implement a wrapper in Swift that bridges the subset of the API you need from Swift to Objective-C. ([#2230](https://github.com/mapbox/mapbox-navigation-ios/pull/2230)) +* Upgraded to [Mapbox Maps SDK for iOS v5.6._x_](https://github.com/mapbox/mapbox-gl-native-ios/releases/tag/ios-v5.6.0). ([#2302](https://github.com/mapbox/mapbox-navigation-ios/pull/2302)) ### User interface * `UserCourseView` is now a type alias of the `UIView` class and the `CourseUpdatable` protocol rather than a protocol in its own right. ([#2230](https://github.com/mapbox/mapbox-navigation-ios/pull/2230)) diff --git a/Cartfile b/Cartfile index 9720d97ae4..2623cc09f7 100644 --- a/Cartfile +++ b/Cartfile @@ -1,7 +1,7 @@ -binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 5.2 +binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 5.6 binary "https://www.mapbox.com/ios-sdk/MapboxNavigationNative.json" ~> 6.2.1 github "mapbox/MapboxDirections.swift" "master" github "mapbox/turf-swift" ~> 0.3 -github "mapbox/mapbox-events-ios" ~> 0.9.5 +github "mapbox/mapbox-events-ios" ~> 0.10 github "ceeK/Solar" ~> 2.1.0 github "mapbox/mapbox-speech-swift" ~> 0.1.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 0a06b3083d..4d19f77383 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,13 +1,13 @@ -binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "5.6.0" +binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "5.6.1" binary "https://www.mapbox.com/ios-sdk/MapboxNavigationNative.json" "6.2.1" github "AndriiDoroshko/SnappyShrimp" "1.6.4" github "CedarBDD/Cedar" "v1.0" github "Quick/Nimble" "v8.0.5" github "Quick/Quick" "v2.2.0" github "ceeK/Solar" "2.1.0" -github "mapbox/MapboxDirections.swift" "edd8c9288282ed0fdf6f710af27d45473820fb2f" +github "mapbox/MapboxDirections.swift" "f1c006600f6f2118196f9959b27067ddbff98aa3" github "mapbox/MapboxGeocoder.swift" "v0.10.2" -github "mapbox/mapbox-events-ios" "v0.9.5" +github "mapbox/mapbox-events-ios" "v0.10.2" github "mapbox/mapbox-speech-swift" "v0.1.1" github "mapbox/turf-swift" "v0.3.0" github "raphaelmor/Polyline" "v4.2.1" diff --git a/MapboxCoreNavigation.podspec b/MapboxCoreNavigation.podspec index 1b15854bf8..def1393d1b 100644 --- a/MapboxCoreNavigation.podspec +++ b/MapboxCoreNavigation.podspec @@ -42,7 +42,7 @@ Pod::Spec.new do |s| s.dependency "MapboxNavigationNative", "~> 6.2.1" s.dependency "MapboxDirections.swift", "~> 0.30.0" # Always pin to a patch release if pre-1.0 - s.dependency "MapboxMobileEvents", "~> 0.9.5" # Always pin to a patch release if pre-1.0 + s.dependency "MapboxMobileEvents", "~> 0.10.2" # Always pin to a patch release if pre-1.0 s.dependency "Turf", "~> 0.3.0" # Always pin to a patch release if pre-1.0 s.swift_version = "5.0" diff --git a/MapboxCoreNavigation/CoreConstants.swift b/MapboxCoreNavigation/CoreConstants.swift index 93bb635957..7ea97b0e75 100644 --- a/MapboxCoreNavigation/CoreConstants.swift +++ b/MapboxCoreNavigation/CoreConstants.swift @@ -35,10 +35,6 @@ public var RouteControllerManeuverZoneRadius: CLLocationDistance = 40 */ public var RouteControllerDeadReckoningTimeInterval: TimeInterval = 1.0 -/** - :nodoc This is used internally for debugging metrics - */ -public var NavigationMetricsDebugLoggingEnabled = "MBNavigationMetricsDebugLoggingEnabled" /** For shorter upcoming steps, we link the `AlertLevel.high` instruction. If the upcoming step duration is near the duration of `RouteControllerHighAlertInterval`, we need to apply a bit of a buffer to prevent back to back notifications. diff --git a/MapboxCoreNavigation/NavigationEventsManager.swift b/MapboxCoreNavigation/NavigationEventsManager.swift index 8017c75db3..c2e8d2c5e5 100644 --- a/MapboxCoreNavigation/NavigationEventsManager.swift +++ b/MapboxCoreNavigation/NavigationEventsManager.swift @@ -83,11 +83,6 @@ open class NavigationEventsManager: NSObject { public var delaysEventFlushing = true func start() { - let eventLoggingEnabled = UserDefaults.standard.bool(forKey: NavigationMetricsDebugLoggingEnabled) - - mobileEventsManager.isDebugLoggingEnabled = eventLoggingEnabled - mobileEventsManager.isMetricsEnabledInSimulator = true - mobileEventsManager.isMetricsEnabledForInUsePermissions = true let userAgent = usesDefaultUserInterface ? "mapbox-navigation-ui-ios" : "mapbox-navigation-ios" mobileEventsManager.initialize(withAccessToken: accessToken, userAgentBase: userAgent, hostSDKVersion: String(describing: Bundle.mapboxCoreNavigation.object(forInfoDictionaryKey: "CFBundleShortVersionString")!)) mobileEventsManager.disableLocationMetrics() diff --git a/MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/PodInstall.xcodeproj/project.pbxproj b/MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/PodInstall.xcodeproj/project.pbxproj index f725bbbd98..8e49f129fb 100644 --- a/MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/PodInstall.xcodeproj/project.pbxproj +++ b/MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/PodInstall.xcodeproj/project.pbxproj @@ -233,8 +233,10 @@ "${PODS_ROOT}/Target Support Files/Pods-PodInstall/Pods-PodInstall-frameworks.sh", "${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework", "${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework.dSYM", - "${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/1C04753A-6715-3177-9FDA-8F75B4324E0C.bcsymbolmap", - "${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/EE5140C5-686C-3DED-8916-3717EC675952.bcsymbolmap", + "${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/F207D6B5-A5AF-3799-A665-6016E3A8EA01.bcsymbolmap", + "${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/8F504B7B-C196-3FBC-B345-1F70257D3AEC.bcsymbolmap", + "${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/2020F3C8-7482-398F-94F5-08E6FADF2B47.bcsymbolmap", + "${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/B2BBCEBE-D9C9-3E98-A63B-0BD273A7B14A.bcsymbolmap", "${BUILT_PRODUCTS_DIR}/MapboxCoreNavigation/MapboxCoreNavigation.framework", "${BUILT_PRODUCTS_DIR}/MapboxDirections.swift/MapboxDirections.framework", "${BUILT_PRODUCTS_DIR}/MapboxMobileEvents/MapboxMobileEvents.framework", @@ -250,8 +252,10 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mapbox.framework", "${DWARF_DSYM_FOLDER_PATH}/Mapbox.framework.dSYM", - "${BUILT_PRODUCTS_DIR}/1C04753A-6715-3177-9FDA-8F75B4324E0C.bcsymbolmap", - "${BUILT_PRODUCTS_DIR}/EE5140C5-686C-3DED-8916-3717EC675952.bcsymbolmap", + "${BUILT_PRODUCTS_DIR}/F207D6B5-A5AF-3799-A665-6016E3A8EA01.bcsymbolmap", + "${BUILT_PRODUCTS_DIR}/8F504B7B-C196-3FBC-B345-1F70257D3AEC.bcsymbolmap", + "${BUILT_PRODUCTS_DIR}/2020F3C8-7482-398F-94F5-08E6FADF2B47.bcsymbolmap", + "${BUILT_PRODUCTS_DIR}/B2BBCEBE-D9C9-3E98-A63B-0BD273A7B14A.bcsymbolmap", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCoreNavigation.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxDirections.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxMobileEvents.framework", diff --git a/MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock b/MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock index ef1507c655..a817c24147 100644 --- a/MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock +++ b/MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock @@ -1,16 +1,17 @@ PODS: - - Mapbox-iOS-SDK (5.5.0) + - Mapbox-iOS-SDK (5.6.0): + - MapboxMobileEvents (= 0.10.2) - MapboxCoreNavigation (0.38.1): - MapboxDirections.swift (~> 0.30.0) - - MapboxMobileEvents (~> 0.9.5) + - MapboxMobileEvents (~> 0.10.2) - MapboxNavigationNative (~> 6.2.1) - Turf (~> 0.3.0) - MapboxDirections.swift (0.30.0): - Polyline (~> 4.2) - Turf (~> 0.3) - - MapboxMobileEvents (0.9.5) + - MapboxMobileEvents (0.10.2) - MapboxNavigation (0.38.1): - - Mapbox-iOS-SDK (~> 5.2) + - Mapbox-iOS-SDK (~> 5.6) - MapboxCoreNavigation (= 0.38.1) - MapboxSpeech (~> 0.1.0) - Solar (~> 2.1) @@ -46,15 +47,15 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: MapboxDirections.swift: - :commit: 4d91bb2bd8332793500b72413d82de0fabe29809 + :commit: f1c006600f6f2118196f9959b27067ddbff98aa3 :git: https://github.com/mapbox/MapboxDirections.swift.git SPEC CHECKSUMS: - Mapbox-iOS-SDK: 7fa66a27e586acb14c7f32ec5a487343e3994451 - MapboxCoreNavigation: a0b212c232dcea1954ed27078ea5e76620a02f58 + Mapbox-iOS-SDK: 913c4655bd72a200f84996caf7a755b377abc77f + MapboxCoreNavigation: edf9a698fcd51b23956e3f5282cc1dae9bc271e4 MapboxDirections.swift: f92188002af2401e2ab97b1e74bf302243d00e43 - MapboxMobileEvents: f6c21b2e59066c5c7093585de7c15adae3b63da0 - MapboxNavigation: cb3ca44dabf351a9636e01f62664715c9c2e9eea + MapboxMobileEvents: 2bc0ca2eedb627b73cf403258dce2b2fa98074a6 + MapboxNavigation: 191779914f336cf998135fc68294c6aa53633241 MapboxNavigationNative: 11dc22140f4698d3f26989f2b6379dc81ef0d4c1 MapboxSpeech: 59b3984d3f433a443d24acf53097f918c5cc70f9 Polyline: 0e9890790292741c8186201a536b6bb6a78d02dd diff --git a/MapboxCoreNavigationTests/NavigationEventsManagerTests.swift b/MapboxCoreNavigationTests/NavigationEventsManagerTests.swift index f3731f2862..acfbfc8976 100644 --- a/MapboxCoreNavigationTests/NavigationEventsManagerTests.swift +++ b/MapboxCoreNavigationTests/NavigationEventsManagerTests.swift @@ -8,7 +8,9 @@ class NavigationEventsManagerTests: XCTestCase { let mobileEventsManagerSpy = MMEEventsManagerSpy() let _ = NavigationEventsManager(dataSource: nil, accessToken: "example token", mobileEventsManager: mobileEventsManagerSpy) - XCTAssertEqual(mobileEventsManagerSpy.accessToken, "example token") + let config = UserDefaults.mme_configuration() + let token = config.mme_accessToken + XCTAssertEqual(token, "example token") } func testDepartRerouteArrive() { diff --git a/MapboxNavigation-Documentation.podspec b/MapboxNavigation-Documentation.podspec index 1100212a4c..b0dbad7502 100644 --- a/MapboxNavigation-Documentation.podspec +++ b/MapboxNavigation-Documentation.podspec @@ -47,8 +47,8 @@ Pod::Spec.new do |s| s.dependency "MapboxDirections.swift", "~> 0.30.0" s.dependency "MapboxGeocoder.swift", "~> 0.10.0" - s.dependency "Mapbox-iOS-SDK", "~> 5.2" - s.dependency "MapboxMobileEvents", "~> 0.9.5" + s.dependency "Mapbox-iOS-SDK", "~> 5.6" + s.dependency "MapboxMobileEvents", "~> 0.10.2" s.dependency "Solar", "~> 2.1" s.dependency "Turf", "~> 0.3.0" s.dependency "MapboxSpeech", "~> 0.1" diff --git a/MapboxNavigation.podspec b/MapboxNavigation.podspec index 7fdcd85373..7d8abf8c88 100644 --- 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 "Mapbox-iOS-SDK", "~> 5.2" + s.dependency "Mapbox-iOS-SDK", "~> 5.6" s.dependency "Solar", "~> 2.1" s.dependency "MapboxSpeech", "~> 0.1.0"