Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require map SDK v5.6.0 #2302

Merged
merged 7 commits into from
Jan 10, 2020
Merged

Require map SDK v5.6.0 #2302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c62cc65
Require map SDK v5.6.0
1ec5 Jan 8, 2020
5cc02c0
WIP: Fixing Build issues with new events library. Note the stringly--…
Jan 9, 2020
082c064
Nixing unwanted magic switch (that enables telemetry collection in th…
Jan 9, 2020
6fa863e
Fixing tests
Jan 9, 2020
e2d1665
Removing malfunctioning code and magic constant that enables it.
Jan 10, 2020
a323709
Updated changelog
1ec5 Jan 10, 2020
2cc308a
Map SDK v5.6.1
1ec5 Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion MapboxCoreNavigation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions MapboxCoreNavigation/CoreConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 0 additions & 5 deletions MapboxCoreNavigation/NavigationEventsManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We decided to remove this setting for the same reason expressed in #304 (review). If navigation events do need to be sent while running in the simulator, we can reenable that workflow in a separate PR.

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()
Expand Down
12 changes: 8 additions & 4 deletions MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/PodInstall.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
19 changes: 10 additions & 9 deletions MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion MapboxCoreNavigationTests/NavigationEventsManagerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions MapboxNavigation-Documentation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion MapboxNavigation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down