From cf78d2a6f21044075370238293ab707b5706525e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20Fay-ch=C3=A2telard?= Date: Mon, 22 Apr 2019 21:07:45 +0200 Subject: [PATCH 1/4] Update OHHTTPStubs to support Swift 5 --- Cartfile.private | 2 +- Cartfile.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 2470034..1174930 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,2 +1,2 @@ binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" ~> 4.0 -github "AliSoftware/OHHTTPStubs" ~> 6.0 +github "AliSoftware/OHHTTPStubs" ~> 8.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 0ba81a8..f583931 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ binary "https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK.json" "4.6.0" -github "AliSoftware/OHHTTPStubs" "6.1.0" +github "AliSoftware/OHHTTPStubs" "8.0.0" From de6fc35180db3b2ff10af6c2bc77c270881983aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20Fay-ch=C3=A2telard?= Date: Mon, 22 Apr 2019 21:09:04 +0200 Subject: [PATCH 2/4] Convert project to Swift 5 --- MapboxGeocoder.xcodeproj/project.pbxproj | 39 +++++++++++++----------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/MapboxGeocoder.xcodeproj/project.pbxproj b/MapboxGeocoder.xcodeproj/project.pbxproj index 7ca9cac..71670c4 100644 --- a/MapboxGeocoder.xcodeproj/project.pbxproj +++ b/MapboxGeocoder.xcodeproj/project.pbxproj @@ -718,19 +718,19 @@ TargetAttributes = { DA5170951CF1B18F00CD6DCF = { CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0910; + LastSwiftMigration = 1020; }; DA51709E1CF1B18F00CD6DCF = { CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0920; + LastSwiftMigration = 1020; }; DA5170C01CF253EE00CD6DCF = { CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0910; + LastSwiftMigration = 1020; }; DA5170C91CF253EE00CD6DCF = { CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0920; + LastSwiftMigration = 1020; }; DA5170EA1CF2581900CD6DCF = { CreatedOnToolsVersion = 7.3.1; @@ -738,11 +738,11 @@ }; DD342B4F19A140EE00219F77 = { CreatedOnToolsVersion = 6.0; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; }; DDC2470319A1C3B40054B0C0 = { CreatedOnToolsVersion = 6.0; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; }; DDC2472919A1C60E0054B0C0 = { CreatedOnToolsVersion = 6.0; @@ -750,7 +750,7 @@ }; DDF1E8491BD6F7BA00C40C78 = { CreatedOnToolsVersion = 7.0.1; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; }; }; }; @@ -759,6 +759,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -1135,7 +1136,7 @@ PRODUCT_NAME = MapboxGeocoder; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1168,7 +1169,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1193,7 +1194,7 @@ PRODUCT_NAME = MapboxGeocoderTests; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1217,7 +1218,7 @@ PRODUCT_NAME = MapboxGeocoderTests; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -1244,7 +1245,7 @@ PRODUCT_NAME = MapboxGeocoder; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1277,7 +1278,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1302,7 +1303,7 @@ PRODUCT_NAME = MapboxGeocoderTests; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; @@ -1325,7 +1326,7 @@ PRODUCT_NAME = MapboxGeocoderTests; SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; @@ -1511,7 +1512,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.Geocoder.Swift; PRODUCT_NAME = "Geocoder (Swift)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1530,7 +1531,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.Geocoder.Swift; PRODUCT_NAME = "Geocoder (Swift)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -1555,6 +1556,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1577,6 +1579,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1631,6 +1634,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoderTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1650,6 +1654,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGeocoderTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; }; name = Release; }; From f83345243809b71e1a7b0a303b246852e7971f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20Fay-ch=C3=A2telard?= Date: Mon, 22 Apr 2019 21:09:38 +0200 Subject: [PATCH 3/4] Automatically fix warnings --- MapboxGeocoder.xcodeproj/project.pbxproj | 7 ++++--- .../xcshareddata/xcschemes/Example (Objective-C).xcscheme | 2 +- .../xcshareddata/xcschemes/Example (Swift).xcscheme | 2 +- .../xcshareddata/xcschemes/MapboxGeocoder Mac.xcscheme | 2 +- .../xcshareddata/xcschemes/MapboxGeocoder iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/MapboxGeocoder tvOS.xcscheme | 2 +- .../xcshareddata/xcschemes/MapboxGeocoder watchOS.xcscheme | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/MapboxGeocoder.xcodeproj/project.pbxproj b/MapboxGeocoder.xcodeproj/project.pbxproj index 71670c4..f9b9f35 100644 --- a/MapboxGeocoder.xcodeproj/project.pbxproj +++ b/MapboxGeocoder.xcodeproj/project.pbxproj @@ -713,7 +713,7 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = Mapbox; TargetAttributes = { DA5170951CF1B18F00CD6DCF = { @@ -756,10 +756,9 @@ }; buildConfigurationList = DD342B4B19A140EE00219F77 /* Build configuration list for PBXProject "MapboxGeocoder" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -1392,6 +1391,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; BITCODE_GENERATION_MODE = bitcode; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -1451,6 +1451,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; BITCODE_GENERATION_MODE = bitcode; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; diff --git a/MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme b/MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme index ce90991..5cb31ad 100644 --- a/MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme +++ b/MapboxGeocoder.xcodeproj/xcshareddata/xcschemes/Example (Objective-C).xcscheme @@ -1,6 +1,6 @@ Date: Mon, 22 Apr 2019 21:16:53 +0200 Subject: [PATCH 4/4] Fix missing device family and swift 5 versions --- MapboxGeocoder.xcodeproj/project.pbxproj | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/MapboxGeocoder.xcodeproj/project.pbxproj b/MapboxGeocoder.xcodeproj/project.pbxproj index f9b9f35..5492676 100644 --- a/MapboxGeocoder.xcodeproj/project.pbxproj +++ b/MapboxGeocoder.xcodeproj/project.pbxproj @@ -734,7 +734,7 @@ }; DA5170EA1CF2581900CD6DCF = { CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1020; }; DD342B4F19A140EE00219F77 = { CreatedOnToolsVersion = 6.0; @@ -1303,6 +1303,7 @@ SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3"; TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; @@ -1326,6 +1327,7 @@ SDKROOT = appletvos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3"; TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; @@ -1350,6 +1352,7 @@ PRODUCT_NAME = MapboxGeocoder; SDKROOT = watchos; SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1379,6 +1382,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1558,6 +1562,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1581,6 +1586,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1636,6 +1642,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3"; }; name = Debug; }; @@ -1656,6 +1663,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2,3"; }; name = Release; };