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

MapboxNavigationNative v28.1 #2770

Merged
merged 1 commit into from
Dec 18, 2020
Merged

MapboxNavigationNative v28.1 #2770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

### Packaging

* Increased the minimum versions of `MapboxNavigationNative` to v26.3, `MapboxCommon` to v9.1.0 and `MapboxDirections` to v1.2. ([#2694](https://github.com/mapbox/mapbox-navigation-ios/pull/2694))
* Increased the minimum versions of `MapboxNavigationNative` to v28.1, `MapboxCommon` to v9.1.0 and `MapboxDirections` to v1.2. ([#2694](https://github.com/mapbox/mapbox-navigation-ios/pull/2694), [#2770](https://github.com/mapbox/mapbox-navigation-ios/pull/2770))
* Installing MapboxCoreNavigation using CocoaPods no longer overrides the `EXCLUDED_ARCHS` build setting of your application’s target. Installing MapboxNavigation still overrides this setting. ([#2770](https://github.com/mapbox/mapbox-navigation-ios/pull/2770))
* Added a Ukrainian localization. ([#2735](https://github.com/mapbox/mapbox-navigation-ios/pull/2735))

### Map
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
binary "https://www.mapbox.com/ios-sdk/MapboxAccounts.json" ~> 2.3.0
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.json" ~> 26.3
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.json" ~> 28.1
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps/mapbox-ios-sdk-dynamic.json" ~> 6.0
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon-ios.json" == 9.1.0
github "mapbox/mapbox-directions-swift" ~> 1.2.0-alpha.3
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon-ios.json" "9.1.0"
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps/mapbox-ios-sdk-dynamic.json" "6.3.0"
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.json" "26.3.1"
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.json" "28.1.0"
binary "https://www.mapbox.com/ios-sdk/MapboxAccounts.json" "2.3.1"
github "CedarBDD/Cedar" "v1.0"
github "Quick/Nimble" "v8.1.2"
Expand Down
12 changes: 1 addition & 11 deletions MapboxCoreNavigation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,11 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.module_name = "MapboxCoreNavigation"

s.dependency "MapboxNavigationNative", "~> 26.3"
s.dependency "MapboxNavigationNative", "~> 28.1"
s.dependency "MapboxAccounts", "~> 2.3.0"
s.dependency "MapboxDirections", "~> 1.2.0-alpha.3"
s.dependency "MapboxMobileEvents", "~> 0.10.2" # Always specify a patch release if pre-v1.0
s.dependency "Turf", "~> 1.0"

s.swift_version = "5.0"

# https://github.com/mapbox/mapbox-navigation-ios/issues/2665
s.user_target_xcconfig = {
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '$(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))',
'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200' => 'arm64 arm64e armv7 armv7s armv6 armv8'
}
s.pod_target_xcconfig = {
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '$(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))',
'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200' => 'arm64 arm64e armv7 armv7s armv6 armv8'
}
end
9 changes: 7 additions & 2 deletions MapboxCoreNavigation/RouteController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Foundation
import CoreLocation
import MapboxCommon
Copy link
Contributor Author

@1ec5 1ec5 Dec 18, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

It doesn’t quite build yet due to a missing type declaration in MapboxNavigationNative.

This import fixed the build. Apparently MapboxCommon defines the MBXExpected class that MapboxNavigationNative now uses (but only forward-declares). Thanks for the suggestion, @SiarheiFedartsou!

import MapboxNavigationNative
import MapboxMobileEvents
import MapboxDirections
Expand Down Expand Up @@ -65,7 +66,7 @@ open class RouteController: NSObject {

var userSnapToStepDistanceFromManeuver: CLLocationDistance?

var previousArrivalWaypoint: Waypoint?
var previousArrivalWaypoint: MapboxDirections.Waypoint?

var isFirstLocation: Bool = true

Expand Down Expand Up @@ -214,9 +215,13 @@ open class RouteController: NSObject {
let routeJSONString = String(data: routeData, encoding: .utf8) else {
return
}
let waypoints = progress.routeOptions.waypoints.map {
MapboxNavigationNative.Waypoint(coordinate: $0.coordinate, isSilent: !$0.separatesLegs)
}
// TODO: Add support for alternative route
let activeGuidanceOptions = ActiveGuidanceOptions(mode: mode(progress.routeOptions.profileIdentifier),
geometryEncoding: geometryEncoding(progress.routeOptions.shapeFormat))
geometryEncoding: geometryEncoding(progress.routeOptions.shapeFormat),
waypoints: waypoints)
navigator.setRouteForRouteResponse(routeJSONString, route: 0, leg: UInt32(routeProgress.legIndex), options: activeGuidanceOptions)
}

Expand Down
8 changes: 4 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 @@ -232,32 +232,32 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-PodInstall/Pods-PodInstall-frameworks.sh",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework",
"${PODS_ROOT}/MapboxAccounts/MapboxAccounts.framework",
"${BUILT_PRODUCTS_DIR}/MapboxCoreNavigation/MapboxCoreNavigation.framework",
"${BUILT_PRODUCTS_DIR}/MapboxDirections/MapboxDirections.framework",
"${BUILT_PRODUCTS_DIR}/MapboxMobileEvents/MapboxMobileEvents.framework",
"${BUILT_PRODUCTS_DIR}/MapboxNavigation/MapboxNavigation.framework",
"${PODS_ROOT}/MapboxNavigationNative/MapboxNavigationNative.framework",
"${BUILT_PRODUCTS_DIR}/MapboxSpeech/MapboxSpeech.framework",
"${BUILT_PRODUCTS_DIR}/Polyline/Polyline.framework",
"${BUILT_PRODUCTS_DIR}/Solar/Solar.framework",
"${BUILT_PRODUCTS_DIR}/Turf/Turf.framework",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxAccounts/MapboxAccounts.framework/MapboxAccounts",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxCommon/MapboxCommon.framework/MapboxCommon",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxNavigationNative/MapboxNavigationNative.framework/MapboxNavigationNative",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mapbox.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxAccounts.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCoreNavigation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxDirections.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxMobileEvents.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxNavigation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxNavigationNative.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxSpeech.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Polyline.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Solar.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Turf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxAccounts.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCommon.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxNavigationNative.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down
14 changes: 7 additions & 7 deletions MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
PODS:
- Mapbox-iOS-SDK (6.3.0):
- MapboxMobileEvents (~> 0.10.4)
- MapboxAccounts (2.3.0)
- MapboxAccounts (2.3.1)
- MapboxCommon (9.1.0)
- MapboxCoreNavigation (1.2.0-alpha.3):
- MapboxAccounts (~> 2.3.0)
- MapboxDirections (~> 1.2.0-alpha.3)
- MapboxMobileEvents (~> 0.10.2)
- MapboxNavigationNative (~> 26.3)
- MapboxNavigationNative (~> 28.1)
- Turf (~> 1.0)
- MapboxDirections (1.2.0-alpha.3):
- Polyline (~> 5.0)
Expand All @@ -19,7 +19,7 @@ PODS:
- MapboxMobileEvents (~> 0.10.2)
- MapboxSpeech (~> 1.0)
- Solar (~> 2.1)
- MapboxNavigationNative (26.3.1):
- MapboxNavigationNative (28.1.0):
- MapboxCommon (= 9.1.0)
- MapboxSpeech (1.0.0)
- Polyline (5.0.2)
Expand Down Expand Up @@ -51,13 +51,13 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
Mapbox-iOS-SDK: 2563ed87ead6ec08f1c2090873977b8a7be335a8
MapboxAccounts: 84abfdde95d9dc483f604c1b0fe1861edf691ce7
MapboxAccounts: e40ef575df5d8b7ef33d0504ff2d393f4fde0455
MapboxCommon: 2de699add978635b5373f6e1ace3d10df12b8459
MapboxCoreNavigation: e4d1a93bd80dbb2cb3b29fbbd2c812272f65544c
MapboxCoreNavigation: abc825f7ffd1da2a05dc2a6a6671429fa400c3f4
MapboxDirections: 193dfc86136b599e9a20fc41d6a8d81ed239854d
MapboxMobileEvents: d0a581dedd8f47411cc65ea520b965e83914316e
MapboxNavigation: 9b7d154a6d79e49c7867d40e797d014a24d7e0c0
MapboxNavigationNative: 685b378d938ca9c2e597818c79b25f5d0066a156
MapboxNavigation: 21a981f58a682d5c5312ddfd8b6ed81ce50b7809
MapboxNavigationNative: f201a0c623baca9a22245f41762653e8c6658e66
MapboxSpeech: 4b3aea42e35d056fae1d7ad847a9fc0f412d911e
Polyline: fce41d72e1146c41c6d081f7656827226f643dff
Solar: 2dc6e7cc39186cb0c8228fa08df76fb50c7d8f24
Expand Down
2 changes: 1 addition & 1 deletion MapboxNavigation-Documentation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Pod::Spec.new do |s|
s.dependency "MapboxGeocoder.swift", "~> 0.10.0"
s.dependency "Mapbox-iOS-SDK", "~> 6.0"
s.dependency "MapboxMobileEvents", "~> 0.10.2"
s.dependency "MapboxNavigationNative", "~> 26.3"
s.dependency "MapboxNavigationNative", "~> 28.1"
s.dependency "Solar", "~> 2.1"
s.dependency "Turf", "~> 1.0"
s.dependency "MapboxSpeech", "~> 1.0"
Expand Down
4 changes: 4 additions & 0 deletions MapboxNavigation.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ Pod::Spec.new do |s|
s.swift_version = "5.0"

# https://github.com/mapbox/mapbox-navigation-ios/issues/2665
s.user_target_xcconfig = {
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '$(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))',
'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200' => 'arm64 arm64e armv7 armv7s armv6 armv8'
}
s.pod_target_xcconfig = {
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => '$(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))',
'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200' => 'arm64 arm64e armv7 armv7s armv6 armv8'
Expand Down