Skip to content

Commit c75d548

Browse files
hactarhactar
authored
Merge pull request mapbox#3 from mapbox/master
Merge upstream
2 parents 0eded46 + a016c58 commit c75d548

File tree

69 files changed

+344
-356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+344
-356
lines changed

‎.circleci/config.yml

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
version: 2.1
2+
3+
step-library:
4+
- &restore-cache
5+
restore_cache:
6+
keys:
7+
- nav-cache-v2-{{ .Environment.CIRCLE_JOB }}-{{ checksum "Cartfile.resolved" }}
8+
- nav-cache-v2-{{ .Environment.CIRCLE_JOB }} # used if checksum fails
9+
10+
- &save-cache
11+
save_cache:
12+
key: nav-cache-v2-{{ .Environment.CIRCLE_JOB }}-{{ checksum "Cartfile.resolved" }}
13+
paths:
14+
- Carthage
15+
16+
- &restore-cache-cocoapods
17+
restore_cache:
18+
keys:
19+
- nav-cache-pod-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock" }}
20+
- nav-cache-pod-v1
21+
22+
- &save-cache-cocoapods
23+
save_cache:
24+
key: nav-cache-pod-v1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Podfile.lock" }}
25+
paths:
26+
- MapboxCoreNavigationTests/CocoaPodsTest/PodInstall/Pods
27+
28+
- &restore-cache-podmaster
29+
restore_cache:
30+
keys:
31+
- podmaster-cache
32+
33+
- &save-cache-podmaster
34+
save_cache:
35+
key: podmaster-cache
36+
paths:
37+
- "~/.cocoapods/repos/master"
38+
39+
- &prepare
40+
run:
41+
name: Prepare
42+
command: |
43+
if [ $(carthage outdated | grep -cF "latest Carthage version") -eq 0 ]; then brew update && brew upgrade carthage || true; fi
44+
echo "foo" > ~/.mapbox
45+
46+
- &verify-missing-localizable-strings
47+
run:
48+
name: Verify missing localizable strings
49+
command: |
50+
./scripts/convert_string_files.sh
51+
git diff --exit-code -- */*/*.lproj
52+
53+
- &install-dependencies
54+
run:
55+
name: Install Dependencies
56+
command: carthage bootstrap --platform ios --cache-builds --configuration Debug --no-use-binaries
57+
58+
- &build-Example
59+
run:
60+
name: Build Example
61+
command: |
62+
xcodebuild -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=12.2,name=iPhone 6 Plus' -project MapboxNavigation.xcodeproj -scheme Example clean build | xcpretty
63+
64+
jobs:
65+
pod-job:
66+
parameters:
67+
update:
68+
type: boolean
69+
default: false
70+
iOS:
71+
type: string
72+
default: "12.2"
73+
xcode:
74+
type: string
75+
default: "10.2.0"
76+
macos:
77+
xcode: << parameters.xcode >>
78+
environment:
79+
HOMEBREW_NO_AUTO_UPDATE: 1
80+
steps:
81+
- checkout
82+
- *restore-cache-podmaster
83+
- *restore-cache-cocoapods
84+
- when:
85+
condition: << parameters.update >>
86+
steps:
87+
- run: cd MapboxCoreNavigationTests/CocoaPodsTest/PodInstall && pod update --repo-update
88+
- unless:
89+
condition: << parameters.update >>
90+
steps:
91+
- run: cd MapboxCoreNavigationTests/CocoaPodsTest/PodInstall && pod install --repo-update
92+
- run: cd MapboxCoreNavigationTests/CocoaPodsTest/PodInstall && xcodebuild -workspace PodInstall.xcworkspace -scheme PodInstall -destination 'platform=iOS Simulator,OS=<< parameters.iOS >>,name=iPhone 6 Plus' clean build | xcpretty
93+
- *save-cache-podmaster
94+
- *save-cache-cocoapods
95+
96+
build-job:
97+
parameters:
98+
xcode:
99+
type: string
100+
default: "10.1.0"
101+
device:
102+
type: string
103+
default: "iPhone 6 Plus"
104+
iOS:
105+
type: string
106+
default: "12.1"
107+
test:
108+
type: boolean
109+
default: true
110+
codecoverage:
111+
type: boolean
112+
default: false
113+
delete_private_deps:
114+
type: boolean
115+
default: false
116+
macos:
117+
xcode: << parameters.xcode >>
118+
environment:
119+
HOMEBREW_NO_AUTO_UPDATE: 1
120+
steps:
121+
- checkout
122+
- *prepare
123+
- *restore-cache
124+
- when:
125+
condition: << parameters.delete_private_deps >>
126+
steps:
127+
- run: rm -rf Cartfile.private && rm -rf Cartfile.resolved
128+
- *install-dependencies
129+
- *save-cache
130+
- run:
131+
name: Install prerequisites
132+
command: if [ $(xcversion simulators | grep -cF "iOS << parameters.iOS >> Simulator (installed)") -eq 0 ]; then xcversion simulators --install="iOS << parameters.iOS >>" || true; fi
133+
- *verify-missing-localizable-strings
134+
- run:
135+
name: MapboxCoreNavigation
136+
command: xcodebuild -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=<< parameters.iOS >>,name=<< parameters.device >>' -project MapboxNavigation.xcodeproj -scheme MapboxCoreNavigation clean build <<# parameters.test >>test <</ parameters.test >> <<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
137+
- when:
138+
condition: << parameters.codecoverage >>
139+
steps:
140+
- run: bash <(curl -s https://codecov.io/bash)
141+
- run:
142+
name: MapboxNavigation
143+
command: xcodebuild -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=<< parameters.iOS >>,name=<< parameters.device >>' -project MapboxNavigation.xcodeproj -scheme MapboxNavigation clean build <<# parameters.test >>test <</ parameters.test >> <<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
144+
- when:
145+
condition: << parameters.codecoverage >>
146+
steps:
147+
- run: bash <(curl -s https://codecov.io/bash)
148+
149+
xcode-10-examples:
150+
macos:
151+
xcode: "10.2.0"
152+
environment:
153+
HOMEBREW_NO_AUTO_UPDATE: 1
154+
steps:
155+
- checkout
156+
- *prepare
157+
- *restore-cache
158+
- *install-dependencies
159+
- *build-Example
160+
- *save-cache
161+
162+
workflows:
163+
workflow:
164+
jobs:
165+
- build-job:
166+
name: "Xcode_10.2_iOS_12.2"
167+
xcode: "10.2.0"
168+
iOS: "12.2"
169+
- build-job:
170+
name: "Xcode_10.1_iOS_12.1"
171+
xcode: "10.1.0"
172+
iOS: "12.1"
173+
codecoverage: true
174+
- build-job:
175+
name: "Xcode_10.1_iOS_9.3"
176+
xcode: "10.1.0"
177+
iOS: "9.3"
178+
delete_private_deps: true
179+
test: false
180+
- pod-job:
181+
name: "Xcode_10.2_iOS_12.2_CP_install"
182+
update: false
183+
xcode: "10.2.0"
184+
iOS: "12.2"
185+
- pod-job:
186+
name: "Xcode_10.2_iOS_12.2_CP_update"
187+
update: true
188+
xcode: "10.2.0"
189+
iOS: "12.2"
190+
- xcode-10-examples

‎.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Bench/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>0.30.0</string>
20+
<string>0.31.0</string>
2121
<key>CFBundleVersion</key>
22-
<string>10</string>
22+
<string>11</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>

‎BenchTests/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.30.0</string>
18+
<string>0.31.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>10</string>
20+
<string>11</string>
2121
</dict>
2222
</plist>

‎BenchUITests/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.30.0</string>
18+
<string>0.31.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>10</string>
20+
<string>11</string>
2121
</dict>
2222
</plist>

‎CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# Changes to the Mapbox Navigation SDK for iOS
22

3-
## master
3+
## v0.31.0
44

55
* Fixed a number of warnings and errors when building the SDK from source using CocoaPods in Swift 4.2. ([#2058](https://github.com/mapbox/mapbox-navigation-ios/pull/2058))
6+
* Restored “Declaration” and “Parameters” sections throughout the API reference. ([#2076](https://github.com/mapbox/mapbox-navigation-ios/pull/2076))
7+
* Deprecated `NavigationMapView.navigationMapDelegate` in favor of `NavigationMapView.navigationMapViewDelegate`. ([#2061](https://github.com/mapbox/mapbox-navigation-ios/pull/2061))
8+
* The `NavigationMapView.navigationMapViewDelegate` and `RouteVoiceController.voiceControllerDelegate` properties are now accessible in Objective-C. ([#2061](https://github.com/mapbox/mapbox-navigation-ios/pull/2061))
9+
* The sources added to the style by `NavigationMapView.showRoutes(_:legIndex:)` once again enables `MGLShapeSourceOptions.lineDistanceMetrics`. ([#2071](https://github.com/mapbox/mapbox-navigation-ios/pull/2071))
10+
* Deprecated `NavigationDirections.configureRouter(tilesURL:translationsURL:completionHandler:)` in favor of `NavigationDirections.configureRouter(tilesURL:completionHandler:)`. ([#2079](https://github.com/mapbox/mapbox-navigation-ios/pull/2079))
11+
* Fixed a crash that occurred if the `Route` lacked `SpokenInstruction` data, such as if the request was made using `RouteOptions` instead of `NavigationRouteOptions` or if the route was generated by a non-Mapbox API. ([#2079](https://github.com/mapbox/mapbox-navigation-ios/pull/2079))
612

713
## v0.30.0
814

‎Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 4.3
2-
binary "https://www.mapbox.com/ios-sdk/MapboxNavigationNative.json" ~> 5.0.0
3-
github "mapbox/MapboxDirections.swift" ~> 0.27.0
2+
binary "https://www.mapbox.com/ios-sdk/MapboxNavigationNative.json" ~> 6.1.1
3+
github "mapbox/MapboxDirections.swift" ~> 0.27.3
44
github "mapbox/turf-swift" ~> 0.3
55
github "mapbox/mapbox-events-ios" ~> 0.8.1
66
github "ceeK/Solar" ~> 2.1.0

‎Cartfile.private

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
github "mapbox/MapboxGeocoder.swift" ~> 0.10
2-
github "Quick/Quick" ~> 1.3
3-
github "Quick/Nimble" ~> 7.1
2+
github "Quick/Quick" ~> 2.0
3+
github "Quick/Nimble" ~> 8.0
44
github "CedarBDD/Cedar" ~> 1.0
55
github "AndriiDoroshko/SnappyShrimp"

‎Cartfile.resolved

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "4.9.0"
2-
binary "https://www.mapbox.com/ios-sdk/MapboxNavigationNative.json" "5.1.0"
2+
binary "https://www.mapbox.com/ios-sdk/MapboxNavigationNative.json" "6.1.1"
33
github "AndriiDoroshko/SnappyShrimp" "1.6.4"
44
github "CedarBDD/Cedar" "v1.0"
5-
github "Quick/Nimble" "v7.3.4"
6-
github "Quick/Quick" "v1.3.4"
5+
github "Quick/Nimble" "v8.0.1"
6+
github "Quick/Quick" "v2.0.0"
77
github "ceeK/Solar" "2.1.0"
88
github "mapbox/MapboxDirections.swift" "v0.27.3"
99
github "mapbox/MapboxGeocoder.swift" "v0.10.2"

‎Example/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.30.0</string>
18+
<string>0.31.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>10</string>
20+
<string>11</string>
2121
<key>LSApplicationCategoryType</key>
2222
<string></string>
2323
<key>LSRequiresIPhoneOS</key>

‎Example/ViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ class ViewController: UIViewController {
330330
func configureMapView(_ mapView: NavigationMapView) {
331331
mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
332332
mapView.delegate = self
333-
mapView.navigationMapDelegate = self
333+
mapView.navigationMapViewDelegate = self
334334
mapView.userTrackingMode = .follow
335335
mapView.logoView.isHidden = true
336336

‎MapboxCoreNavigation.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
33
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
44

55
s.name = "MapboxCoreNavigation"
6-
s.version = "0.30.0"
6+
s.version = "0.31.0"
77
s.summary = "Core components for turn-by-turn navigation on iOS."
88

99
s.description = <<-DESC
@@ -40,8 +40,8 @@ Pod::Spec.new do |s|
4040
s.requires_arc = true
4141
s.module_name = "MapboxCoreNavigation"
4242

43-
s.dependency "MapboxNavigationNative", "~> 5.0.0"
44-
s.dependency "MapboxDirections.swift", "~> 0.27.0" # Always pin to a patch release if pre-1.0
43+
s.dependency "MapboxNavigationNative", "~> 6.1.1"
44+
s.dependency "MapboxDirections.swift", "~> 0.27.3" # Always pin to a patch release if pre-1.0
4545
s.dependency "MapboxMobileEvents", "~> 0.8.1" # Always pin to a patch release if pre-1.0
4646
s.dependency "Turf", "~> 0.3.0" # Always pin to a patch release if pre-1.0
4747

‎MapboxCoreNavigation/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.30.0</string>
18+
<string>0.31.0</string>
1919
<key>CFBundleVersion</key>
20-
<string>10</string>
20+
<string>11</string>
2121
<key>NSPrincipalClass</key>
2222
<string></string>
2323
</dict>

0 commit comments

Comments
 (0)