Skip to content

Commit 0eb3059

Browse files
authored
Merge pull request #35 from cruisediary/support-xcode10
Support Xcode 10
2 parents eeb5d77 + 4cab83d commit 0eb3059

File tree

6 files changed

+25
-48
lines changed

6 files changed

+25
-48
lines changed

Example/Pastel.xcodeproj/project.pbxproj

+2-32
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@
170170
607FACCD1AFB9204008FA782 /* Frameworks */,
171171
607FACCE1AFB9204008FA782 /* Resources */,
172172
1CA69834BB733805260916E0 /* [CP] Embed Pods Frameworks */,
173-
7D8433D705A37E2737182B2E /* [CP] Copy Pods Resources */,
174173
);
175174
buildRules = (
176175
);
@@ -190,7 +189,6 @@
190189
607FACE21AFB9204008FA782 /* Frameworks */,
191190
607FACE31AFB9204008FA782 /* Resources */,
192191
BB4B6AD1DC5EF07FF40713C5 /* [CP] Embed Pods Frameworks */,
193-
39C08A66EE5609688CC45CEC /* [CP] Copy Pods Resources */,
194192
);
195193
buildRules = (
196194
);
@@ -283,21 +281,6 @@
283281
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-frameworks.sh\"\n";
284282
showEnvVarsInLog = 0;
285283
};
286-
39C08A66EE5609688CC45CEC /* [CP] Copy Pods Resources */ = {
287-
isa = PBXShellScriptBuildPhase;
288-
buildActionMask = 2147483647;
289-
files = (
290-
);
291-
inputPaths = (
292-
);
293-
name = "[CP] Copy Pods Resources";
294-
outputPaths = (
295-
);
296-
runOnlyForDeploymentPostprocessing = 0;
297-
shellPath = /bin/sh;
298-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Tests/Pods-Pastel_Tests-resources.sh\"\n";
299-
showEnvVarsInLog = 0;
300-
};
301284
408A916A556BF553CFBE03BD /* [CP] Check Pods Manifest.lock */ = {
302285
isa = PBXShellScriptBuildPhase;
303286
buildActionMask = 2147483647;
@@ -316,21 +299,6 @@
316299
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";
317300
showEnvVarsInLog = 0;
318301
};
319-
7D8433D705A37E2737182B2E /* [CP] Copy Pods Resources */ = {
320-
isa = PBXShellScriptBuildPhase;
321-
buildActionMask = 2147483647;
322-
files = (
323-
);
324-
inputPaths = (
325-
);
326-
name = "[CP] Copy Pods Resources";
327-
outputPaths = (
328-
);
329-
runOnlyForDeploymentPostprocessing = 0;
330-
shellPath = /bin/sh;
331-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Pastel_Example/Pods-Pastel_Example-resources.sh\"\n";
332-
showEnvVarsInLog = 0;
333-
};
334302
B1800ACFF9C12C48B5BE424D /* [CP] Check Pods Manifest.lock */ = {
335303
isa = PBXShellScriptBuildPhase;
336304
buildActionMask = 2147483647;
@@ -469,6 +437,7 @@
469437
ONLY_ACTIVE_ARCH = YES;
470438
SDKROOT = iphoneos;
471439
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
440+
SWIFT_VERSION = 4.0;
472441
};
473442
name = Debug;
474443
};
@@ -508,6 +477,7 @@
508477
MTL_ENABLE_DEBUG_INFO = NO;
509478
SDKROOT = iphoneos;
510479
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
480+
SWIFT_VERSION = 4.0;
511481
VALIDATE_PRODUCT = YES;
512482
};
513483
name = Release;

Example/Podfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ inhibit_all_warnings!
55
def test_pods
66
pod 'FBSnapshotTestCase'
77
pod 'Nimble-Snapshots', '~> 6.3.0'
8-
pod 'Nimble', '~> 7.0'
9-
pod 'Quick', '~> 1.2'
8+
pod 'Nimble', '~> 7.3.1'
9+
pod 'Quick', '~> 1.3.2'
1010

1111
end
1212

Example/Podfile.lock

+18-11
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,40 @@ PODS:
44
- FBSnapshotTestCase/Core (2.1.4)
55
- FBSnapshotTestCase/SwiftSupport (2.1.4):
66
- FBSnapshotTestCase/Core
7-
- Nimble (7.0.3)
7+
- Nimble (7.3.1)
88
- Nimble-Snapshots (6.3.0):
99
- Nimble-Snapshots/Core (= 6.3.0)
1010
- Nimble-Snapshots/Core (6.3.0):
1111
- FBSnapshotTestCase (~> 2.0)
1212
- Nimble (~> 7.0)
13-
- Pastel (0.4.0)
14-
- Quick (1.2.0)
13+
- Pastel (0.5.0)
14+
- Quick (1.3.2)
1515

1616
DEPENDENCIES:
1717
- FBSnapshotTestCase
18-
- Nimble (~> 7.0)
18+
- Nimble (~> 7.3.1)
1919
- Nimble-Snapshots (~> 6.3.0)
2020
- Pastel (from `../`)
21-
- Quick (~> 1.2)
21+
- Quick (~> 1.3.2)
22+
23+
SPEC REPOS:
24+
https://github.com/cocoapods/specs.git:
25+
- FBSnapshotTestCase
26+
- Nimble
27+
- Nimble-Snapshots
28+
- Quick
2229

2330
EXTERNAL SOURCES:
2431
Pastel:
25-
:path: ../
32+
:path: "../"
2633

2734
SPEC CHECKSUMS:
2835
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
29-
Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
36+
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
3037
Nimble-Snapshots: f5459b5b091678dc942d03ec4741cacb58ba4a52
31-
Pastel: b0ccd2e328e41bfcd2f1e569e635287db0fcb85b
32-
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
38+
Pastel: be3ff2b241fec4b53fa4414861545abe0901e189
39+
Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
3340

34-
PODFILE CHECKSUM: f198729f7f6cafa872cc267edd92b44abd9a67e1
41+
PODFILE CHECKSUM: ccacd491a98b491348fe4fb5167bf530cd55eec8
3542

36-
COCOAPODS: 1.4.0
43+
COCOAPODS: 1.5.3

Pastel.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'Pastel'
11-
s.version = '0.4.0'
11+
s.version = '0.5.0'
1212
s.summary = 'Instagram like gradient background animation'
1313

1414
# This description is used to generate tags and improve search results.

Pastel/Classes/PastelView.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ open class PastelView: UIView {
103103
let animation = CABasicAnimation(keyPath: Animation.keyPath)
104104
animation.duration = animationDuration
105105
animation.toValue = currentGradientSet()
106-
animation.fillMode = .forwards
106+
animation.fillMode = kCAFillModeForwards
107107
animation.isRemovedOnCompletion = false
108108
animation.delegate = self
109109
gradient.add(animation, forKey: Animation.key)

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pod "Pastel"
6060

6161
### Carthage
6262
```
63-
github "cruisediary/Pastel" ~> 0.4.0
63+
github "cruisediary/Pastel" ~> 0.5.0
6464
```
6565

6666
## Example

0 commit comments

Comments
 (0)