From a9a92af3dc4c260bc1682d7730dbc827ef17fb37 Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Wed, 26 Sep 2018 16:28:40 +0900 Subject: [PATCH 1/5] Update DKChainableAnimationKit+Bezier.swift --- .../Classes/DKChainableAnimationKit+Bezier.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DKChainableAnimationKit/Classes/DKChainableAnimationKit+Bezier.swift b/DKChainableAnimationKit/Classes/DKChainableAnimationKit+Bezier.swift index d99ed4f..ef9fb07 100644 --- a/DKChainableAnimationKit/Classes/DKChainableAnimationKit+Bezier.swift +++ b/DKChainableAnimationKit/Classes/DKChainableAnimationKit+Bezier.swift @@ -28,7 +28,7 @@ public extension DKChainableAnimationKit { self.addAnimationCalculationAction { (view: UIView) -> Void in let pathAnimation = self.basicAnimationForKeyPath("position") pathAnimation.path = path.cgPath - pathAnimation.rotationMode = kCAAnimationRotateAuto + pathAnimation.rotationMode = CAAnimationRotationMode.rotateAuto self.addAnimationFromCalculationBlock(pathAnimation) } @@ -43,7 +43,7 @@ public extension DKChainableAnimationKit { self.addAnimationCalculationAction { (view: UIView) -> Void in let pathAnimation = self.basicAnimationForKeyPath("position") pathAnimation.path = path.cgPath - pathAnimation.rotationMode = kCAAnimationRotateAutoReverse + pathAnimation.rotationMode = CAAnimationRotationMode.rotateAutoReverse self.addAnimationFromCalculationBlock(pathAnimation) } From 20dcd3abb037e46a763945872d22ba2b72ecf90f Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Wed, 26 Sep 2018 16:30:34 +0900 Subject: [PATCH 2/5] Update DKChainableAnimationKit.swift --- DKChainableAnimationKit/Classes/DKChainableAnimationKit.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DKChainableAnimationKit/Classes/DKChainableAnimationKit.swift b/DKChainableAnimationKit/Classes/DKChainableAnimationKit.swift index 19c2f6b..4fd486a 100644 --- a/DKChainableAnimationKit/Classes/DKChainableAnimationKit.swift +++ b/DKChainableAnimationKit/Classes/DKChainableAnimationKit.swift @@ -207,7 +207,7 @@ open class DKChainableAnimationKit { self.clear() if let completion = self.animationCompletion { self.animationCompletion = nil - completion() + completion(()) } } else { self.animateChain() From b7990ab68775d565dfa69dd1ea3c774493fbd530 Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Wed, 26 Sep 2018 16:31:48 +0900 Subject: [PATCH 3/5] Update DKKeyFrameAnimation.swift --- DKChainableAnimationKit/Classes/DKKeyFrameAnimation.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DKChainableAnimationKit/Classes/DKKeyFrameAnimation.swift b/DKChainableAnimationKit/Classes/DKKeyFrameAnimation.swift index 1a6babb..ac26b68 100644 --- a/DKChainableAnimationKit/Classes/DKKeyFrameAnimation.swift +++ b/DKChainableAnimationKit/Classes/DKKeyFrameAnimation.swift @@ -123,7 +123,7 @@ open class DKKeyFrameAnimation: CAKeyframeAnimation { m41: m41, m42: m42, m43: m43, m44: m44) as [AnyObject] } } - self.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionLinear) + self.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear) } } From 796ae5bcf01c48a5309ca24946bbe5bbbd5e513a Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Wed, 26 Sep 2018 16:40:04 +0900 Subject: [PATCH 4/5] Update to Swift 4.2 --- .../project.pbxproj | 17 +++++++++++++++-- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../Classes/DKChainableAnimationKit.swift | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 DKChainableAnimationKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/DKChainableAnimationKit.xcodeproj/project.pbxproj b/DKChainableAnimationKit.xcodeproj/project.pbxproj index fad47d3..d7dfdd4 100644 --- a/DKChainableAnimationKit.xcodeproj/project.pbxproj +++ b/DKChainableAnimationKit.xcodeproj/project.pbxproj @@ -203,10 +203,13 @@ TargetAttributes = { 5287D6731B1120E6006A9A84 = { CreatedOnToolsVersion = 6.3.2; + DevelopmentTeam = 4V6HDFWSR4; LastSwiftMigration = 0920; + ProvisioningStyle = Automatic; }; 5287D67E1B1120E6006A9A84 = { CreatedOnToolsVersion = 6.3.2; + DevelopmentTeam = U6G6XZT3DJ; LastSwiftMigration = 0830; }; }; @@ -381,8 +384,11 @@ 5287D68B1B1120E6006A9A84 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 4V6HDFWSR4; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -391,17 +397,21 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.draveness.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; 5287D68C1B1120E6006A9A84 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 4V6HDFWSR4; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -410,15 +420,17 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.draveness.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; 5287D68E1B1120E6006A9A84 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + DEVELOPMENT_TEAM = U6G6XZT3DJ; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", @@ -438,6 +450,7 @@ 5287D68F1B1120E6006A9A84 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + DEVELOPMENT_TEAM = U6G6XZT3DJ; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", diff --git a/DKChainableAnimationKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DKChainableAnimationKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/DKChainableAnimationKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/DKChainableAnimationKit/Classes/DKChainableAnimationKit.swift b/DKChainableAnimationKit/Classes/DKChainableAnimationKit.swift index 4fd486a..19c2f6b 100644 --- a/DKChainableAnimationKit/Classes/DKChainableAnimationKit.swift +++ b/DKChainableAnimationKit/Classes/DKChainableAnimationKit.swift @@ -207,7 +207,7 @@ open class DKChainableAnimationKit { self.clear() if let completion = self.animationCompletion { self.animationCompletion = nil - completion(()) + completion() } } else { self.animateChain() From 3ae268d17cc2ef2dbf77c00c80d776db5c651b3e Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Wed, 26 Sep 2018 16:43:02 +0900 Subject: [PATCH 5/5] Change defined swift version to 4.2 --- DKChainableAnimationKit.xcodeproj/project.pbxproj | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/DKChainableAnimationKit.xcodeproj/project.pbxproj b/DKChainableAnimationKit.xcodeproj/project.pbxproj index d7dfdd4..585e027 100644 --- a/DKChainableAnimationKit.xcodeproj/project.pbxproj +++ b/DKChainableAnimationKit.xcodeproj/project.pbxproj @@ -210,7 +210,7 @@ 5287D67E1B1120E6006A9A84 = { CreatedOnToolsVersion = 6.3.2; DevelopmentTeam = U6G6XZT3DJ; - LastSwiftMigration = 0830; + LastSwiftMigration = 1000; }; }; }; @@ -443,7 +443,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.draveness.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -459,7 +460,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.draveness.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.2; }; name = Release; };