Merge pull request #57 from gzkiwiinc/swift4.0

swift4.0
icanzilb · Oct 7, 2017 · 57028b9 · 57028b9
2 parents 8d90297 + 669a032
commit 57028b9
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 21 deletions.
diff --git a/EasyAnimation.xcodeproj/project.pbxproj b/EasyAnimation.xcodeproj/project.pbxproj
@@ -355,7 +355,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.easyanimation.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -375,7 +375,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/EasyAnimation/EasyAnimation.swift b/EasyAnimation/EasyAnimation.swift
@@ -133,26 +133,40 @@ extension UIView {
 
     fileprivate static func replaceAnimationMethods() {
         //replace actionForLayer...
-        method_exchangeImplementations(
-            class_getInstanceMethod(self, #selector(UIView.action(for:forKey:))),
-            class_getInstanceMethod(self, #selector(UIView.EA_actionForLayer(_:forKey:))))
+        if
+            let origMethod = class_getInstanceMethod(self, #selector(UIView.action(for:forKey:))),
+            let eaMethod = class_getInstanceMethod(self, #selector(UIView.EA_actionForLayer(_:forKey:))) {
+            method_exchangeImplementations(origMethod, eaMethod)
+        }
 
         //replace animateWithDuration...
-        method_exchangeImplementations(
-            class_getClassMethod(self, #selector(UIView.animate(withDuration:animations:))),
-            class_getClassMethod(self, #selector(UIView.EA_animate(withDuration:animations:))))
-        method_exchangeImplementations(
-            class_getClassMethod(self, #selector(UIView.animate(withDuration:animations:completion:))),
-            class_getClassMethod(self, #selector(UIView.EA_animate(withDuration:animations:completion:))))
-        method_exchangeImplementations(
-            class_getClassMethod(self, #selector(UIView.animate(withDuration:delay:options:animations:completion:))),
-            class_getClassMethod(self, #selector(UIView.EA_animate(withDuration:delay:options:animations:completion:))))
-        method_exchangeImplementations(
-            class_getClassMethod(self, #selector(UIView.animate(withDuration:delay:usingSpringWithDamping:initialSpringVelocity:options:animations:completion:))),
-            class_getClassMethod(self, #selector(UIView.EA_animate(withDuration:delay:usingSpringWithDamping:initialSpringVelocity:options:animations:completion:))))
+        if
+            let origMethod = class_getClassMethod(self, #selector(UIView.animate(withDuration:animations:))),
+            let eaMethod = class_getClassMethod(self, #selector(UIView.EA_animate(withDuration:animations:))) {
+            method_exchangeImplementations(origMethod, eaMethod)
+        }
+
+        if
+            let origMethod = class_getClassMethod(self, #selector(UIView.animate(withDuration:animations:completion:))),
+            let eaMethod = class_getClassMethod(self, #selector(UIView.EA_animate(withDuration:animations:completion:))) {
+            method_exchangeImplementations(origMethod, eaMethod)
+        }
+
+        if
+            let origMethod = class_getClassMethod(self, #selector(UIView.animate(withDuration:delay:options:animations:completion:))),
+            let eaMethod = class_getClassMethod(self, #selector(UIView.EA_animate(withDuration:delay:options:animations:completion:))) {
+            method_exchangeImplementations(origMethod, eaMethod)
+        }
+
+        if
+            let origMethod = class_getClassMethod(self, #selector(UIView.animate(withDuration:delay:usingSpringWithDamping:initialSpringVelocity:options:animations:completion:))),
+            let eaMethod = class_getClassMethod(self, #selector(UIView.EA_animate(withDuration:delay:usingSpringWithDamping:initialSpringVelocity:options:animations:completion:))) {
+            method_exchangeImplementations(origMethod, eaMethod)
+        }
 
     }
 
+    @objc
     func EA_actionForLayer(_ layer: CALayer!, forKey key: String!) -> CAAction! {
 
         let result = EA_actionForLayer(layer, forKey: key)
@@ -185,6 +199,7 @@ extension UIView {
         return result
     }
 
+    @objc
     class func EA_animate(withDuration duration: TimeInterval, delay: TimeInterval, usingSpringWithDamping dampingRatio: CGFloat, initialSpringVelocity velocity: CGFloat, options: UIViewAnimationOptions, animations: () -> Void, completion: ((Bool) -> Void)?) {
         //create context
         let context = AnimationContext()
@@ -224,6 +239,7 @@ extension UIView {
         CATransaction.commit()
     }
 
+    @objc
     class func EA_animate(withDuration duration: TimeInterval, delay: TimeInterval, options: UIViewAnimationOptions, animations: () -> Void, completion: ((Bool) -> Void)?) {
 
         //create context
@@ -268,14 +284,17 @@ extension UIView {
         CATransaction.commit()
     }
 
+    @objc
     class func EA_animate(withDuration duration: TimeInterval, animations: @escaping () -> Void, completion: ((Bool) -> Void)?) {
         animate(withDuration: duration, delay: 0.0, options: [], animations: animations, completion: completion)
     }
 
+    @objc
     class func EA_animate(withDuration duration: TimeInterval, animations: @escaping () -> Void) {
         animate(withDuration: duration, animations: animations, completion: nil)
     }
 
+    @objc
     class func EA_wrappedCompletionHandler(_ timer: Timer) {
         if let completionBlock = timer.userInfo as? CompletionBlock {
             completionBlock.wrapCompletion(true)
@@ -444,14 +463,16 @@ extension UIView {
 
 extension CALayer {
     // MARK: CALayer animations
-
     fileprivate static func replaceAnimationMethods() {
         //replace actionForKey
-        method_exchangeImplementations(
-            class_getInstanceMethod(self, #selector(CALayer.action(forKey:))),
-            class_getInstanceMethod(self, #selector(CALayer.EA_action(forKey:))))
+        if
+            let origMethod = class_getInstanceMethod(self, #selector(CALayer.action(forKey:))),
+            let eaMethod = class_getInstanceMethod(self, #selector(CALayer.EA_action(forKey:))) {
+            method_exchangeImplementations(origMethod, eaMethod)
+        }
     }
 
+    @objc
     public func EA_action(forKey key: String!) -> CAAction! {
 
         //check if the layer has a view-delegate