Migrate Sample Project to Swift 5

bcylin · May 27, 2019 · 369e652 · 369e652
1 parent cfac587
commit 369e652
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/Example-iOS/ViewControllers/ExampleViewController.swift b/Example-iOS/ViewControllers/ExampleViewController.swift
@@ -122,7 +122,7 @@ internal final class ExampleViewController: QuickTableViewController {
   private func showDebuggingText(_ text: String) {
     print(text)
     debugging.rows = [NavigationRow(text: text, detailText: .none)]
-    if let section = tableContents.index(where: { $0 === debugging }) {
+    if let section = tableContents.firstIndex(where: { $0 === debugging }) {
       tableView.reloadSections([section], with: .none)
     }
   }

diff --git a/QuickTableViewController.xcodeproj/project.pbxproj b/QuickTableViewController.xcodeproj/project.pbxproj
@@ -783,18 +783,18 @@
 					};
 					B51F21A11F417037009BC2C9 = {
 						CreatedOnToolsVersion = 8.3.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					B51F21BF1F41E600009BC2C9 = {
 						CreatedOnToolsVersion = 8.3.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 						TestTargetID = B51F21A11F417037009BC2C9;
 					};
 					B5334F121B8CC5BD00C64A6D = {
 						CreatedOnToolsVersion = 6.4;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 					};
 					B5334F1D1B8CC5BD00C64A6D = {
 						CreatedOnToolsVersion = 6.4;
@@ -821,6 +821,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -1363,6 +1364,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1383,6 +1385,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1405,6 +1408,7 @@
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = "Example-iOS";
 			};
 			name = Debug;
@@ -1427,6 +1431,7 @@
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = "Example-iOS";
 			};
 			name = Release;
@@ -1567,6 +1572,7 @@
 				PRODUCT_NAME = QuickTableViewController;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1586,6 +1592,7 @@
 				PRODUCT_NAME = QuickTableViewController;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Source/Model/RadioSection.swift b/Source/Model/RadioSection.swift
@@ -69,7 +69,7 @@ open class RadioSection: Section {
 
   /// Returns the selected index, or nil when nothing is selected.
   open var indexOfSelectedOption: Int? {
-    return options.index { $0.isSelected }
+    return options.firstIndex { $0.isSelected }
   }
 
   /// Returns the selected option row, or nil when nothing is selected.
@@ -97,7 +97,7 @@ open class RadioSection: Section {
 
     if option.isSelected {
       // Deselect the selected option.
-      return options.index(where: { $0 === option }).map { [$0] } ?? []
+      return options.firstIndex(where: { $0 === option }).map { [$0] } ?? []
     }
 
     var toggledIndexes: IndexSet = []