From 5edc8fc203afffe7702ce9a6b55b65e77f6256f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= <mxn@1ec5.org>
Date: Fri, 21 Dec 2018 11:05:34 -0800
Subject: [ios] Migrated tests, playground to Swift 4.2

---
 platform/darwin/test/MGLSDKTestHelpers.swift | 7 +------
 platform/ios/ios.xcodeproj/project.pbxproj   | 8 ++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/platform/darwin/test/MGLSDKTestHelpers.swift b/platform/darwin/test/MGLSDKTestHelpers.swift
index 727d8bf0c6..1d174b37bc 100644
--- a/platform/darwin/test/MGLSDKTestHelpers.swift
+++ b/platform/darwin/test/MGLSDKTestHelpers.swift
@@ -40,12 +40,7 @@ extension MGLSDKTestHelpers {
         for i in 0..<Int(methodCount) {
             let method = methodList![i]
             let selector = method_getName(method)
-            #if os(macOS)
-                methods.insert(selector.description)
-            #else
-                XCTAssertNotNil(selector)
-                methods.insert(selector!.description)
-            #endif
+            methods.insert(selector.description)
         }
         free(methodList)
         return methods
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index e58bdbac31..45c42e65b9 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -2867,7 +2867,7 @@
 					};
 					DA2E88501CC036F400F24E7B = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 1010;
 					};
 					DA8847D11CBAF91600AB86E3 = {
 						CreatedOnToolsVersion = 7.3;
@@ -3900,7 +3900,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.test;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "../darwin/test/test-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = RelWithDebInfo;
 		};
@@ -4142,7 +4142,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "../darwin/test/test-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -4172,7 +4172,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.test;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "../darwin/test/test-Bridging-Header.h";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
-- 
cgit v1.2.1