Configure for Swift 5

.travis.yml

@@ -16,9 +16,6 @@ matrix:
   - xcode_scheme: Apollo
     xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=10.3.1,name=iPhone 7"
-  - xcode_scheme: Apollo
-    xcode_sdk: iphonesimulator12.2
-    env: DESTINATION="platform=iOS Simulator,OS=9.3,name=iPhone 6s"
   - xcode_scheme: Apollo
     xcode_sdk: appletvsimulator12.2
     env: DESTINATION="platform=tvOS Simulator,OS=12.2,name=Apple TV"
@@ -34,9 +31,6 @@ matrix:
   - xcode_scheme: ApolloSQLite
     xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=10.3.1,name=iPhone 7"
-  - xcode_scheme: ApolloSQLite
-    xcode_sdk: iphonesimulator12.2
-    env: DESTINATION="platform=iOS Simulator,OS=9.3,name=iPhone 6s"
   - xcode_scheme: ApolloWebSocket
     xcode_sdk: macosx10.14
     env: DESTINATION="platform=macOS,arch=x86_64"
@@ -49,9 +43,6 @@ matrix:
   - xcode_scheme: ApolloWebSocket
     xcode_sdk: iphonesimulator12.2
     env: DESTINATION="platform=iOS Simulator,OS=10.3.1,name=iPhone 7"
-  - xcode_scheme: ApolloWebSocket
-    xcode_sdk: iphonesimulator12.2
-    env: DESTINATION="platform=iOS Simulator,OS=9.3,name=iPhone 6s"
 
 cache:
   directories:

Apollo.xcodeproj/project.pbxproj

@@ -869,17 +869,17 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Apollo GraphQL";
 				TargetAttributes = {
 					9F8A95771EC0FC1200304A2D = {
 						CreatedOnToolsVersion = 8.3.2;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					9FA6ABBB1EC0A988000017BE = {
 						CreatedOnToolsVersion = 8.3.2;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					9FACA9B71F42E67200AE2DBD = {
@@ -893,18 +893,18 @@
 					9FC750431D2A532C00458D91 = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeamName = "Martijn Walraven";
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					9FC7504D1D2A532D00458D91 = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeamName = "Martijn Walraven";
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					9FCE2CF91E6C213D00E34457 = {
 						CreatedOnToolsVersion = 8.2.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					9FD637E01E6ACF88001EDBC8 = {
@@ -915,10 +915,9 @@
 			};
 			buildConfigurationList = 9FC7503E1D2A532C00458D91 /* Build configuration list for PBXProject "Apollo" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				Base,
 			);
@@ -1006,7 +1005,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/sh -x";
-			shellScript = "APOLLO_FRAMEWORK_PATH=$(eval find $FRAMEWORK_SEARCH_PATHS -name \"Apollo.framework\" -maxdepth 1)\n\nif [ -z \"$APOLLO_FRAMEWORK_PATH\" ]; then\necho \"error: Couldn't find Apollo.framework in FRAMEWORK_SEARCH_PATHS; make sure to add the framework to your project.\"\nexit 1\nfi\n\ncd ${SRCROOT}/Tests/StarWarsAPI\n$(find $APOLLO_FRAMEWORK_PATH/ -name 'check-and-run-apollo-cli.sh') codegen:generate --queries=\"$(find . -name '*.graphql')\" --schema=schema.json --mergeInFieldsFromFragmentSpreads API.swift";
+			shellScript = "APOLLO_FRAMEWORK_PATH=$(eval find $FRAMEWORK_SEARCH_PATHS -name \"Apollo.framework\" -maxdepth 1)\n\nif [ -z \"$APOLLO_FRAMEWORK_PATH\" ]; then\necho \"error: Couldn't find Apollo.framework in FRAMEWORK_SEARCH_PATHS; make sure to add the framework to your project.\"\nexit 1\nfi\n\ncd ${SRCROOT}/Tests/StarWarsAPI\n$(find $APOLLO_FRAMEWORK_PATH/ -name 'check-and-run-apollo-cli.sh') codegen:generate --queries=\"$(find . -name '*.graphql')\" --schema=schema.json --mergeInFieldsFromFragmentSpreads API.swift\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

Apollo.xcodeproj/xcshareddata/xcschemes/Apollo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Apollo.xcodeproj/xcshareddata/xcschemes/ApolloPerformanceTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ApolloSQLite.xcodeproj/project.pbxproj

@@ -316,7 +316,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1020;
 				TargetAttributes = {
 					543806941EA56C2200F55B72 = {
 						CreatedOnToolsVersion = 8.3.1;
@@ -336,11 +336,11 @@
 			};
 			buildConfigurationList = 54DDB0B81EA1523E0009DD99 /* Build configuration list for PBXProject "ApolloSQLite" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
+				Base,
 			);
 			mainGroup = 54DDB0B41EA1523E0009DD99;
 			productRefGroup = 54DDB0BF1EA1523E0009DD99 /* Products */;

ApolloSQLite.xcodeproj/xcshareddata/xcschemes/ApolloSQLite.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ApolloWebSocket.xcodeproj/project.pbxproj

@@ -228,6 +228,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 720160C1206AB3D30052B2EE;
 			productRefGroup = 720160CC206AB3D30052B2EE /* Products */;

ApolloWebSocket.xcodeproj/xcshareddata/xcschemes/ApolloWebSocket.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Configuration/Shared/Workspace-Language.xcconfig

@@ -14,11 +14,12 @@ CLANG_MODULES_AUTOLINK = YES
 
 CLANG_CXX_LANGUAGE_STANDARD = gnu++11
 CLANG_CXX_LIBRARY = libc++
+CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES
 
 ENABLE_STRICT_OBJC_MSGSEND = YES
 
 // Swift
-SWIFT_VERSION = 4.2
+SWIFT_VERSION = 5.0
 SWIFT_PRECOMPILE_BRIDGING_HEADER = YES
 SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(CONFIGURATION:upper)
 SWIFT_SWIFT3_OBJC_INFERENCE = Off

Sources/Apollo/Collections.swift

@@ -24,7 +24,7 @@ struct GroupedSequence<Key: Equatable, Value> {
   fileprivate var groupsForKeys: [[Value]] = []
 
   mutating func append(value: Value, forKey key: Key) -> (Int, Int) {
-    if let index = keys.index(where: { $0 == key }) {
+    if let index = keys.firstIndex(where: { $0 == key }) {
       groupsForKeys[index].append(value)
       return (index, groupsForKeys[index].endIndex - 1)
     } else {