diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2018-12-21 11:05:34 -0800 |
|---|---|---|
| committer | Jason Wray <friedbunny@users.noreply.github.com> | 2019-01-09 14:52:30 -0500 |
| commit | 4be73454e64c498723abddf462026ecdb9d4ef94 (patch) | |
| tree | d90344e5e6e5a4d9b63acd0e0fe0e016556dc74a | |
| parent | b9dcfd1ae4cb73a6950f72faf3880cd9713c109c (diff) | |
| download | qtlocation-mapboxgl-4be73454e64c498723abddf462026ecdb9d4ef94.tar.gz | |
[ios] Migrated tests, playground to Swift 4.2
| -rw-r--r-- | platform/darwin/test/MGLSDKTestHelpers.swift | 7 | ||||
| -rw-r--r-- | 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; }; |