Skip to content

Commit 6704dfa

Browse files
MaximAlienMaximAlien
authored
Remove iOS 11 support. (#4142)
1 parent a7b037a commit 6704dfa

File tree

24 files changed

+117
-162
lines changed

24 files changed

+117
-162
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## v2.9.0
44

5+
### Packaging
6+
7+
* 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))
8+
* 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))
9+
* 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))
10+
511
### Map
612

713
* `NavigationMapView.removeAlternativeRoutes()` and `NavigationMapView.removeContinuousAlternativeRoutesDurations()` were made public to provide a way to remove previously shown alternative routes and alternative routes duration annotations, respectively. ([#4134](https://github.com/mapbox/mapbox-navigation-ios/pull/4134))

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" == 23.0.0
22
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" ~> 115.0
3-
github "mapbox/mapbox-directions-swift" == 2.7.0-rc.1
3+
github "mapbox/mapbox-directions-swift" == 2.8.0-alpha.1
44
github "mapbox/mapbox-events-ios" ~> 1.0.0

‎Cartfile.private‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "Quick/Quick" ~> 3.1.2
22
github "Quick/Nimble" ~> 9.0.1
3-
github "pointfreeco/swift-snapshot-testing" ~> 1.8.0
3+
github "pointfreeco/swift-snapshot-testing" == 1.9.0

‎Cartfile.resolved‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon.json" "23.0.0"
2-
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "115.0.0"
2+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-navigation-native/MapboxNavigationNative.xcframework.json" "115.0.1"
33
github "Quick/Nimble" "v9.2.1"
44
github "Quick/Quick" "v3.1.2"
5-
github "mapbox/mapbox-directions-swift" "v2.7.0-rc.1"
5+
github "mapbox/mapbox-directions-swift" "v2.8.0-alpha.1"
66
github "mapbox/mapbox-events-ios" "v1.0.8"
77
github "mapbox/turf-swift" "v2.5.0"
88
github "pointfreeco/swift-snapshot-testing" "1.9.0"
9-
github "raphaelmor/Polyline" "v5.0.3"
9+
github "raphaelmor/Polyline" "v5.1.0"

‎Example/ViewController.swift‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,8 @@ class ViewController: UIViewController {
269269
func beginCarPlayNavigation() {
270270
let delegate = UIApplication.shared.delegate as? AppDelegate
271271

272-
if #available(iOS 12.0, *),
273-
let service = activeNavigationViewController?.navigationService,
274-
let location = service.router.location {
272+
if let service = activeNavigationViewController?.navigationService,
273+
let location = service.router.location {
275274
delegate?.carPlayManager.beginNavigationWithCarPlay(using: location.coordinate, navigationService: service)
276275
}
277276
}
@@ -663,7 +662,7 @@ class ViewController: UIViewController {
663662
}
664663

665664
func endCarPlayNavigation(canceled: Bool) {
666-
if #available(iOS 12.0, *), let delegate = UIApplication.shared.delegate as? AppDelegate {
665+
if let delegate = UIApplication.shared.delegate as? AppDelegate {
667666
delegate.carPlayManager.carPlayNavigationViewController?.exitNavigation(byCanceling: canceled)
668667
}
669668
}
@@ -766,8 +765,7 @@ extension ViewController: NavigationMapViewDelegate {
766765
extension ViewController: NavigationViewControllerDelegate {
767766

768767
func navigationViewController(_ navigationViewController: NavigationViewController, didArriveAt waypoint: Waypoint) -> Bool {
769-
if #available(iOS 12.0, *),
770-
let delegate = UIApplication.shared.delegate as? AppDelegate,
768+
if let delegate = UIApplication.shared.delegate as? AppDelegate,
771769
let carPlayNavigationViewController = delegate.carPlayManager.carPlayNavigationViewController {
772770
return carPlayNavigationViewController.navigationService(navigationViewController.navigationService, didArriveAt: waypoint)
773771
}

‎MapboxCoreNavigation.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
2424

2525
# ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
2626

27-
s.ios.deployment_target = "11.0"
27+
s.ios.deployment_target = "12.0"
2828

2929

3030
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
@@ -41,7 +41,7 @@ Pod::Spec.new do |s|
4141
s.module_name = "MapboxCoreNavigation"
4242

4343
s.dependency "MapboxNavigationNative", "~> 115.0"
44-
s.dependency "MapboxDirections-pre", "2.7.0-rc.1"
44+
s.dependency "MapboxDirections-pre", "2.8.0-alpha.1"
4545
s.dependency "MapboxMobileEvents", "~> 1.0"
4646

4747
s.swift_version = "5.5"

‎MapboxNavigation-SPM.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,7 @@
878878
DEVELOPMENT_TEAM = GJZR2MEM28;
879879
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
880880
INFOPLIST_FILE = Example/Info.plist;
881+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
881882
LD_RUNPATH_SEARCH_PATHS = (
882883
"$(inherited)",
883884
"@executable_path/Frameworks",
@@ -897,6 +898,7 @@
897898
DEVELOPMENT_TEAM = GJZR2MEM28;
898899
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
899900
INFOPLIST_FILE = Example/Info.plist;
901+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
900902
LD_RUNPATH_SEARCH_PATHS = (
901903
"$(inherited)",
902904
"@executable_path/Frameworks",
@@ -1146,6 +1148,7 @@
11461148
DEVELOPMENT_TEAM = GJZR2MEM28;
11471149
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
11481150
INFOPLIST_FILE = Example/Info.plist;
1151+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
11491152
LD_RUNPATH_SEARCH_PATHS = (
11501153
"$(inherited)",
11511154
"@executable_path/Frameworks",
@@ -1172,6 +1175,7 @@
11721175
DEVELOPMENT_TEAM = GJZR2MEM28;
11731176
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
11741177
INFOPLIST_FILE = Example/Info.plist;
1178+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
11751179
LD_RUNPATH_SEARCH_PATHS = (
11761180
"$(inherited)",
11771181
"@executable_path/Frameworks",
@@ -1236,7 +1240,7 @@
12361240
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12371241
GCC_WARN_UNUSED_FUNCTION = YES;
12381242
GCC_WARN_UNUSED_VARIABLE = YES;
1239-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1243+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
12401244
MTL_ENABLE_DEBUG_INFO = YES;
12411245
ONLY_ACTIVE_ARCH = YES;
12421246
SDKROOT = iphoneos;
@@ -1295,7 +1299,7 @@
12951299
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12961300
GCC_WARN_UNUSED_FUNCTION = YES;
12971301
GCC_WARN_UNUSED_VARIABLE = YES;
1298-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1302+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
12991303
MTL_ENABLE_DEBUG_INFO = NO;
13001304
SDKROOT = iphoneos;
13011305
SWIFT_COMPILATION_MODE = wholemodule;

‎MapboxNavigation-SPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MapboxNavigation.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
2424

2525
# ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
2626

27-
s.ios.deployment_target = "11.0"
27+
s.ios.deployment_target = "12.0"
2828

2929
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
3030

‎MapboxNavigation.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3348,6 +3348,7 @@
33483348
);
33493349
INFOPLIST_FILE = Sources/MapboxNavigation/Info.plist;
33503350
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3351+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
33513352
LD_RUNPATH_SEARCH_PATHS = (
33523353
"$(inherited)",
33533354
"@executable_path/Frameworks",
@@ -3375,6 +3376,7 @@
33753376
);
33763377
INFOPLIST_FILE = Sources/MapboxNavigation/Info.plist;
33773378
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3379+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
33783380
LD_RUNPATH_SEARCH_PATHS = (
33793381
"$(inherited)",
33803382
"@executable_path/Frameworks",
@@ -3399,6 +3401,7 @@
33993401
"$(PROJECT_DIR)/Carthage/Checkouts/mapbox-events-ios/Frameworks",
34003402
);
34013403
INFOPLIST_FILE = Tests/MapboxNavigationTests/Info.plist;
3404+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
34023405
LD_RUNPATH_SEARCH_PATHS = (
34033406
"$(inherited)",
34043407
"@executable_path/Frameworks",
@@ -3421,6 +3424,7 @@
34213424
"$(PROJECT_DIR)/Carthage/Checkouts/mapbox-events-ios/Frameworks",
34223425
);
34233426
INFOPLIST_FILE = Tests/MapboxNavigationTests/Info.plist;
3427+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
34243428
LD_RUNPATH_SEARCH_PATHS = (
34253429
"$(inherited)",
34263430
"@executable_path/Frameworks",
@@ -3453,6 +3457,7 @@
34533457
GCC_C_LANGUAGE_STANDARD = gnu11;
34543458
INFOPLIST_FILE = Sources/TestHelper/Info.plist;
34553459
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3460+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
34563461
LD_RUNPATH_SEARCH_PATHS = (
34573462
"$(inherited)",
34583463
"@executable_path/Frameworks",
@@ -3489,6 +3494,7 @@
34893494
GCC_C_LANGUAGE_STANDARD = gnu11;
34903495
INFOPLIST_FILE = Sources/TestHelper/Info.plist;
34913496
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3497+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
34923498
LD_RUNPATH_SEARCH_PATHS = (
34933499
"$(inherited)",
34943500
"@executable_path/Frameworks",
@@ -3555,7 +3561,7 @@
35553561
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
35563562
GCC_WARN_UNUSED_FUNCTION = YES;
35573563
GCC_WARN_UNUSED_VARIABLE = YES;
3558-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
3564+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
35593565
MTL_ENABLE_DEBUG_INFO = YES;
35603566
ONLY_ACTIVE_ARCH = YES;
35613567
SDKROOT = iphoneos;
@@ -3614,7 +3620,7 @@
36143620
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
36153621
GCC_WARN_UNUSED_FUNCTION = YES;
36163622
GCC_WARN_UNUSED_VARIABLE = YES;
3617-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
3623+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
36183624
MTL_ENABLE_DEBUG_INFO = NO;
36193625
SDKROOT = iphoneos;
36203626
SWIFT_COMPILATION_MODE = wholemodule;
@@ -3641,6 +3647,7 @@
36413647
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
36423648
INFOPLIST_FILE = Sources/MapboxCoreNavigation/Info.plist;
36433649
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3650+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
36443651
LD_RUNPATH_SEARCH_PATHS = (
36453652
"$(inherited)",
36463653
"@executable_path/Frameworks",
@@ -3667,6 +3674,7 @@
36673674
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
36683675
INFOPLIST_FILE = Sources/MapboxCoreNavigation/Info.plist;
36693676
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3677+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
36703678
LD_RUNPATH_SEARCH_PATHS = (
36713679
"$(inherited)",
36723680
"@executable_path/Frameworks",
@@ -3687,6 +3695,7 @@
36873695
DEVELOPMENT_TEAM = GJZR2MEM28;
36883696
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
36893697
INFOPLIST_FILE = Tests/MapboxCoreNavigationTests/Info.plist;
3698+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
36903699
LD_RUNPATH_SEARCH_PATHS = (
36913700
"$(inherited)",
36923701
"@executable_path/Frameworks",
@@ -3708,6 +3717,7 @@
37083717
DEVELOPMENT_TEAM = GJZR2MEM28;
37093718
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
37103719
INFOPLIST_FILE = Tests/MapboxCoreNavigationTests/Info.plist;
3720+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
37113721
LD_RUNPATH_SEARCH_PATHS = (
37123722
"$(inherited)",
37133723
"@executable_path/Frameworks",

0 commit comments

Comments
 (0)