From 82c2265e763867b56ca605632dc7c60d7a46299d Mon Sep 17 00:00:00 2001 From: Cruz Date: Sun, 23 Sep 2018 17:00:02 +0900 Subject: [PATCH 1/4] Update Podfile of examples for support Xcode 10 Swift 4 --- Example/Podfile | 4 ++-- Example/Podfile.lock | 25 ++++++++++++++++--------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Example/Podfile b/Example/Podfile index 9522d99..889ce2a 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -5,8 +5,8 @@ inhibit_all_warnings! def test_pods pod 'FBSnapshotTestCase' pod 'Nimble-Snapshots', '~> 6.3.0' - pod 'Nimble', '~> 7.0' - pod 'Quick', '~> 1.2' + pod 'Nimble', '~> 7.3.1' + pod 'Quick', '~> 1.3.2' end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 77a84fe..eac6679 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -4,33 +4,40 @@ PODS: - FBSnapshotTestCase/Core (2.1.4) - FBSnapshotTestCase/SwiftSupport (2.1.4): - FBSnapshotTestCase/Core - - Nimble (7.0.3) + - Nimble (7.3.1) - Nimble-Snapshots (6.3.0): - Nimble-Snapshots/Core (= 6.3.0) - Nimble-Snapshots/Core (6.3.0): - FBSnapshotTestCase (~> 2.0) - Nimble (~> 7.0) - Pastel (0.4.0) - - Quick (1.2.0) + - Quick (1.3.2) DEPENDENCIES: - FBSnapshotTestCase - - Nimble (~> 7.0) + - Nimble (~> 7.3.1) - Nimble-Snapshots (~> 6.3.0) - Pastel (from `../`) - - Quick (~> 1.2) + - Quick (~> 1.3.2) + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - FBSnapshotTestCase + - Nimble + - Nimble-Snapshots + - Quick EXTERNAL SOURCES: Pastel: - :path: ../ + :path: "../" SPEC CHECKSUMS: FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a - Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac + Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae Nimble-Snapshots: f5459b5b091678dc942d03ec4741cacb58ba4a52 Pastel: b0ccd2e328e41bfcd2f1e569e635287db0fcb85b - Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08 + Quick: 2623cb30d7a7f41ca62f684f679586558f483d46 -PODFILE CHECKSUM: f198729f7f6cafa872cc267edd92b44abd9a67e1 +PODFILE CHECKSUM: ccacd491a98b491348fe4fb5167bf530cd55eec8 -COCOAPODS: 1.4.0 +COCOAPODS: 1.5.3 From 3e3a4b21611c1ed5f3d36f19eb09f08bdf4f48c9 Mon Sep 17 00:00:00 2001 From: Cruz Date: Sun, 23 Sep 2018 17:07:44 +0900 Subject: [PATCH 2/4] Support Xcode 10 Swift 4 --- Example/Pastel.xcodeproj/project.pbxproj | 34 ++---------------------- Pastel/Classes/PastelView.swift | 2 +- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/Example/Pastel.xcodeproj/project.pbxproj b/Example/Pastel.xcodeproj/project.pbxproj index 7bee7e8..7822d29 100644 --- a/Example/Pastel.xcodeproj/project.pbxproj +++ b/Example/Pastel.xcodeproj/project.pbxproj @@ -170,7 +170,6 @@ 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, 1CA69834BB733805260916E0 /* [CP] Embed Pods Frameworks */, - 7D8433D705A37E2737182B2E /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -190,7 +189,6 @@ 607FACE21AFB9204008FA782 /* Frameworks */, 607FACE31AFB9204008FA782 /* Resources */, BB4B6AD1DC5EF07FF40713C5 /* [CP] Embed Pods Frameworks */, - 39C08A66EE5609688CC45CEC /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -283,21 +281,6 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 39C08A66EE5609688CC45CEC /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Tests/Pods-Pastel_Tests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 408A916A556BF553CFBE03BD /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -316,21 +299,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 7D8433D705A37E2737182B2E /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; B1800ACFF9C12C48B5BE424D /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -469,6 +437,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -508,6 +477,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/Pastel/Classes/PastelView.swift b/Pastel/Classes/PastelView.swift index ef17a17..ead33d9 100644 --- a/Pastel/Classes/PastelView.swift +++ b/Pastel/Classes/PastelView.swift @@ -103,7 +103,7 @@ open class PastelView: UIView { let animation = CABasicAnimation(keyPath: Animation.keyPath) animation.duration = animationDuration animation.toValue = currentGradientSet() - animation.fillMode = .forwards + animation.fillMode = kCAFillModeForwards animation.isRemovedOnCompletion = false animation.delegate = self gradient.add(animation, forKey: Animation.key) From be406a60e2e521241596115babf42ad549873780 Mon Sep 17 00:00:00 2001 From: Cruz Date: Sun, 23 Sep 2018 17:10:45 +0900 Subject: [PATCH 3/4] Bumping version to 0.5.0 --- Example/Podfile.lock | 4 ++-- Pastel.podspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index eac6679..6e0c8c1 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -10,7 +10,7 @@ PODS: - Nimble-Snapshots/Core (6.3.0): - FBSnapshotTestCase (~> 2.0) - Nimble (~> 7.0) - - Pastel (0.4.0) + - Pastel (0.5.0) - Quick (1.3.2) DEPENDENCIES: @@ -35,7 +35,7 @@ SPEC CHECKSUMS: FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae Nimble-Snapshots: f5459b5b091678dc942d03ec4741cacb58ba4a52 - Pastel: b0ccd2e328e41bfcd2f1e569e635287db0fcb85b + Pastel: be3ff2b241fec4b53fa4414861545abe0901e189 Quick: 2623cb30d7a7f41ca62f684f679586558f483d46 PODFILE CHECKSUM: ccacd491a98b491348fe4fb5167bf530cd55eec8 diff --git a/Pastel.podspec b/Pastel.podspec index aa69dd6..4cf864d 100644 --- a/Pastel.podspec +++ b/Pastel.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'Pastel' - s.version = '0.4.0' + s.version = '0.5.0' s.summary = 'Instagram like gradient background animation' # This description is used to generate tags and improve search results. From 4cab83ddf2c8570e684d6e738a525350ec66ba61 Mon Sep 17 00:00:00 2001 From: Cruz Date: Sun, 23 Sep 2018 17:18:21 +0900 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e6fcd0d..0dbb08b 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ pod "Pastel" ### Carthage ``` -github "cruisediary/Pastel" ~> 0.4.0 +github "cruisediary/Pastel" ~> 0.5.0 ``` ## Example