Convert to Swift 5

tattn · Mar 27, 2019 · 3d0a10a · 3d0a10a
1 parent de5c204
commit 3d0a10a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/Examples/AutoExample/AppDelegate.swift b/Examples/AutoExample/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Sources/SwipeTransition/OneFingerDirectionalPanGestureRecognizer.swift b/Sources/SwipeTransition/OneFingerDirectionalPanGestureRecognizer.swift
@@ -7,7 +7,6 @@
 //
 
 import UIKit
-import UIKit.UIGestureRecognizerSubclass
 
 final class OneFingerDirectionalPanGestureRecognizer: UIPanGestureRecognizer {
     enum PanDirection {

diff --git a/Sources/SwipeTransition/SwipeBack/SwipeBackController.swift b/Sources/SwipeTransition/SwipeBack/SwipeBackController.swift
@@ -95,7 +95,7 @@ extension SwipeBackController: UIGestureRecognizerDelegate {
         }
         return context.allowsTransitionStart
     }
-    
+
     public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
         return !(touch.view is UISlider)
     }

diff --git a/Sources/SwipeTransition/SwipeBack/SwipeBackExtensions.swift b/Sources/SwipeTransition/SwipeBack/SwipeBackExtensions.swift
@@ -9,7 +9,7 @@
 import UIKit
 
 public extension UINavigationController {
-    public var swipeBack: SwipeBackController? {
+    var swipeBack: SwipeBackController? {
         get {
             return objc_getAssociatedObject(self, &AssocKey.swipeBack) as? SwipeBackController
         }

diff --git a/Sources/SwipeTransition/SwipeToDismiss/SwipeToDismissExtensions.swift b/Sources/SwipeTransition/SwipeToDismiss/SwipeToDismissExtensions.swift
@@ -9,7 +9,7 @@
 import UIKit
 
 public extension UIViewController {
-    public var swipeToDismiss: SwipeToDismissController? {
+    var swipeToDismiss: SwipeToDismissController? {
         get {
             return objc_getAssociatedObject(self, &AssocKey.swipeToDismiss) as? SwipeToDismissController
         }

diff --git a/SwipeTransition.xcodeproj/project.pbxproj b/SwipeTransition.xcodeproj/project.pbxproj
@@ -577,7 +577,7 @@
 					};
 					241BA6C51FEC271B002E8902 = {
 						CreatedOnToolsVersion = 9.2;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					241BA6D81FEC480E002E8902 = {
@@ -587,14 +587,17 @@
 					};
 					2467A7B71FEF7E44007A7AC9 = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					2467A7DD1FEFD393007A7AC9 = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					2467A7FA1FEFDA2B007A7AC9 = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -1033,6 +1036,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1054,6 +1058,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.tattn.SwipeTransition;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1107,6 +1112,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.tattn.AutoSwipeBack;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1128,6 +1134,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.tattn.AutoSwipeBack;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1144,6 +1151,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.tattn.AutoExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1160,6 +1168,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.tattn.AutoExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1181,6 +1190,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.tattn.AutoSwipeToDismiss;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1202,6 +1212,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.tattn.AutoSwipeToDismiss;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,7 +95,7 @@ extension SwipeBackController: UIGestureRecognizerDelegate { @@
             }
             return context.allowsTransitionStart
         }
         public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
             return !(touch.view is UISlider)
         }
@@ Expand Down @@