Skip to content

Commit b078f41

Browse files
1ec51ec5
authored
Merge pull request #143 from mapbox/1ec5-ios-v4.0.0
Upgrade Xcode project, map SDK
2 parents 92eef7d + 289ed9e commit b078f41

File tree

11 files changed

+19
-27
lines changed

11 files changed

+19
-27
lines changed

‎Cartfile.private‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 3.4
1+
binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 4.0
22
github "AliSoftware/OHHTTPStubs" ~> 6.0

‎Cartfile.resolved‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "3.7.0"
1+
binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "4.0.0"
22
github "AliSoftware/OHHTTPStubs" "6.1.0"

‎Geocoder Example/ViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ - (void)viewDidLoad {
3030

3131
NSAssert(![MapboxAccessToken isEqualToString:@"<# your Mapbox access token #>"], @"You must set `MapboxAccessToken` to your Mapbox access token.");
3232

33-
[MGLAccountManager setAccessToken:MapboxAccessToken];
33+
MGLAccountManager.accessToken = MapboxAccessToken;
3434
self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds];
3535
self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
3636
self.mapView.delegate = self;

‎Geocoder Example/ViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ViewController: UIViewController, MGLMapViewDelegate {
2323

2424
assert(MapboxAccessToken != "<# your Mapbox access token #>", "You must set `MapboxAccessToken` to your Mapbox access token.")
2525

26-
MGLAccountManager.setAccessToken(MapboxAccessToken)
26+
MGLAccountManager.accessToken = MapboxAccessToken
2727
mapView = MGLMapView(frame: view.bounds)
2828
mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
2929
mapView.delegate = self

‎MapboxGeocoder.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@
623623
attributes = {
624624
LastSwiftMigration = 0700;
625625
LastSwiftUpdateCheck = 0730;
626-
LastUpgradeCheck = 0910;
626+
LastUpgradeCheck = 0930;
627627
ORGANIZATIONNAME = Mapbox;
628628
TargetAttributes = {
629629
DA5170951CF1B18F00CD6DCF = {
@@ -1276,12 +1276,14 @@
12761276
CLANG_WARN_BOOL_CONVERSION = YES;
12771277
CLANG_WARN_COMMA = YES;
12781278
CLANG_WARN_CONSTANT_CONVERSION = YES;
1279+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
12791280
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
12801281
CLANG_WARN_EMPTY_BODY = YES;
12811282
CLANG_WARN_ENUM_CONVERSION = YES;
12821283
CLANG_WARN_INFINITE_RECURSION = YES;
12831284
CLANG_WARN_INT_CONVERSION = YES;
12841285
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1286+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
12851287
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
12861288
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
12871289
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1333,12 +1335,14 @@
13331335
CLANG_WARN_BOOL_CONVERSION = YES;
13341336
CLANG_WARN_COMMA = YES;
13351337
CLANG_WARN_CONSTANT_CONVERSION = YES;
1338+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
13361339
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13371340
CLANG_WARN_EMPTY_BODY = YES;
13381341
CLANG_WARN_ENUM_CONVERSION = YES;
13391342
CLANG_WARN_INFINITE_RECURSION = YES;
13401343
CLANG_WARN_INT_CONVERSION = YES;
13411344
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1345+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
13421346
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13431347
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
13441348
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

‎MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -76,7 +75,6 @@
7675
buildConfiguration = "Debug"
7776
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7877
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
79-
language = ""
8078
launchStyle = "0"
8179
useCustomWorkingDirectory = "NO"
8280
ignoresPersistentStateOnLaunch = "NO"

‎MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/Example (Swift).xcscheme‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -76,7 +75,6 @@
7675
buildConfiguration = "Debug"
7776
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7877
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
79-
language = ""
8078
launchStyle = "0"
8179
useCustomWorkingDirectory = "NO"
8280
ignoresPersistentStateOnLaunch = "NO"

‎MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/MapboxGeocoder Mac.xcscheme‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
30-
shouldUseLaunchSchemeArgsEnv = "YES"
31-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3231
<Testables>
3332
<TestableReference
3433
skipped = "NO">
@@ -57,7 +56,6 @@
5756
buildConfiguration = "Debug"
5857
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5958
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60-
language = ""
6159
launchStyle = "0"
6260
useCustomWorkingDirectory = "NO"
6361
ignoresPersistentStateOnLaunch = "NO"

‎MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/MapboxGeocoder iOS.xcscheme‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
30-
shouldUseLaunchSchemeArgsEnv = "YES"
31-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3231
<Testables>
3332
<TestableReference
3433
skipped = "NO">
@@ -57,7 +56,6 @@
5756
buildConfiguration = "Debug"
5857
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5958
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60-
language = ""
6159
launchStyle = "0"
6260
useCustomWorkingDirectory = "NO"
6361
ignoresPersistentStateOnLaunch = "NO"

‎MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/MapboxGeocoder tvOS.xcscheme‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)