swift 4.2 migration

lightsprint09 · Jan 4, 2019 · 7d9103d · 7d9103d
1 parent 62d4083
commit 7d9103d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
@@ -131,6 +131,7 @@
 				TargetAttributes = {
 					C688F5BC1FFF6137000A4B06 = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -323,7 +324,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.dbsystel.Demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -337,7 +338,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.dbsystel.Demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Demo/Demo/AppDelegate.swift b/Demo/Demo/AppDelegate.swift
@@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Source/ChangeAnimator/TableViewChangesAnimator.swift b/Source/ChangeAnimator/TableViewChangesAnimator.swift
@@ -37,18 +37,18 @@
         private let configuration: Configuration
 
         public struct Configuration {
-            let insert: UITableViewRowAnimation
-            let update: UITableViewRowAnimation
-            let move: UITableViewRowAnimation
-            let delete: UITableViewRowAnimation
-            let insertSection: UITableViewRowAnimation
-            let updateSection: UITableViewRowAnimation
-            let deleteSection: UITableViewRowAnimation
+            let insert: UITableView.RowAnimation
+            let update: UITableView.RowAnimation
+            let move: UITableView.RowAnimation
+            let delete: UITableView.RowAnimation
+            let insertSection: UITableView.RowAnimation
+            let updateSection: UITableView.RowAnimation
+            let deleteSection: UITableView.RowAnimation
 
-            public init(insert: UITableViewRowAnimation = .automatic, update: UITableViewRowAnimation = .automatic,
-                        move: UITableViewRowAnimation = .automatic, delete: UITableViewRowAnimation = .automatic,
-                        insertSection: UITableViewRowAnimation = .automatic, updateSection: UITableViewRowAnimation = .automatic,
-                        deleteSection: UITableViewRowAnimation = .automatic) {
+            public init(insert: UITableView.RowAnimation = .automatic, update: UITableView.RowAnimation = .automatic,
+                        move: UITableView.RowAnimation = .automatic, delete: UITableView.RowAnimation = .automatic,
+                        insertSection: UITableView.RowAnimation = .automatic, updateSection: UITableView.RowAnimation = .automatic,
+                        deleteSection: UITableView.RowAnimation = .automatic) {
                 self.insert = insert
                 self.update = update
                 self.move = move

diff --git a/Source/DataSource/TableViewDataSource.swift b/Source/DataSource/TableViewDataSource.swift
@@ -135,7 +135,7 @@
         }
 
         /// :nodoc:
-        public func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle,
+        public func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle,
                               forRowAt indexPath: IndexPath) {
             guard let dataModificator = dataModificator else {
                 return

diff --git a/Sourcing.xcodeproj/project.pbxproj b/Sourcing.xcodeproj/project.pbxproj
@@ -451,7 +451,7 @@
 				TargetAttributes = {
 					9432D24E1CF5ABC300B72986 = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0910;
+						LastSwiftMigration = 1010;
 					};
 					9432D2581CF5ABC300B72986 = {
 						CreatedOnToolsVersion = 7.3.1;
@@ -741,8 +741,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = 2UNP9S73JZ;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -763,8 +762,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = 2UNP9S73JZ;
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};