Skip to content
This repository was archived by the owner on Jan 5, 2020. It is now read-only.

Update to Swift 4.2 #35

Open
quangctkm9207 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update to Swift 4.2 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9a92af
Update DKChainableAnimationKit+Bezier.swift
quangctkm9207 Sep 26, 2018
20dcd3a
Update DKChainableAnimationKit.swift
quangctkm9207 Sep 26, 2018
b7990ab
Update DKKeyFrameAnimation.swift
quangctkm9207 Sep 26, 2018
796ae5b
Update to Swift 4.2
quangctkm9207 Sep 26, 2018
3ae268d
Change defined swift version to 4.2
quangctkm9207 Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions DKChainableAnimationKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,14 @@
TargetAttributes = {
5287D6731B1120E6006A9A84 = {
CreatedOnToolsVersion = 6.3.2;
DevelopmentTeam = 4V6HDFWSR4;
LastSwiftMigration = 0920;
ProvisioningStyle = Automatic;
};
5287D67E1B1120E6006A9A84 = {
CreatedOnToolsVersion = 6.3.2;
LastSwiftMigration = 0830;
DevelopmentTeam = U6G6XZT3DJ;
LastSwiftMigration = 1000;
};
};
};
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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)",
Expand All @@ -431,13 +443,15 @@
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;
};
5287D68F1B1120E6006A9A84 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEVELOPMENT_TEAM = U6G6XZT3DJ;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand All @@ -446,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;
};
Expand Down
8 changes: 8 additions & 0 deletions DKChainableAnimationKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
4 changes: 2 additions & 2 deletions DKChainableAnimationKit/Classes/DKChainableAnimationKit+Bezier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand All @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion DKChainableAnimationKit/Classes/DKKeyFrameAnimation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down