Skip to content

Commit e595d34

Browse files
committed
Use Swift 4.2
1 parent 2951506 commit e595d34

File tree

8 files changed

+17
-47
lines changed

8 files changed

+17
-47
lines changed

.mention-bot

Lines changed: 0 additions & 3 deletions
This file was deleted.

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.2

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "hyperoslo/Cache" "5.1.0"
1+
github "hyperoslo/Cache" "5.2.0"

Example/ImaginaryDemo/ImaginaryDemo.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
files = (
183183
);
184184
inputPaths = (
185-
"${SRCROOT}/Pods/Target Support Files/Pods-ImaginaryDemo/Pods-ImaginaryDemo-frameworks.sh",
185+
"${PODS_ROOT}/Target Support Files/Pods-ImaginaryDemo/Pods-ImaginaryDemo-frameworks.sh",
186186
"${BUILT_PRODUCTS_DIR}/Cache/Cache.framework",
187187
"${BUILT_PRODUCTS_DIR}/Imaginary/Imaginary.framework",
188188
);
@@ -193,7 +193,7 @@
193193
);
194194
runOnlyForDeploymentPostprocessing = 0;
195195
shellPath = /bin/sh;
196-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImaginaryDemo/Pods-ImaginaryDemo-frameworks.sh\"\n";
196+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ImaginaryDemo/Pods-ImaginaryDemo-frameworks.sh\"\n";
197197
showEnvVarsInLog = 0;
198198
};
199199
/* End PBXShellScriptBuildPhase section */

Example/ImaginaryDemo/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PODS:
2-
- Cache (5.1.0)
3-
- Imaginary (4.0.0):
2+
- Cache (5.2.0)
3+
- Imaginary (4.2.0):
44
- Cache (~> 5.0)
55

66
DEPENDENCIES:
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
1515
:path: "../../"
1616

1717
SPEC CHECKSUMS:
18-
Cache: 7737c595aae7d94c7c0feca2c887288624e3b07e
19-
Imaginary: 441fc8390e20f99e2025cc40643acc037e84dd30
18+
Cache: 807c5d86d01a177f06ede9865add3aea269bbfd4
19+
Imaginary: deadb35fdfc6cfbe25d1baf3f1e421929f577142
2020

2121
PODFILE CHECKSUM: 317cccf04e61f3f6f7e8a7e2dbc1ad0f7fa2beee
2222

23-
COCOAPODS: 1.5.3
23+
COCOAPODS: 1.6.0.beta.1

Imaginary.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "Imaginary"
33
s.summary = "Remote images, as easy as one, two, three."
4-
s.version = "4.0.0"
4+
s.version = "4.2.0"
55
s.homepage = "https://github.com/hyperoslo/Imaginary"
66
s.license = 'MIT'
77
s.author = { "Hyper Interaktiv AS" => "[email protected]" }
@@ -20,5 +20,5 @@ Pod::Spec.new do |s|
2020
s.frameworks = 'Foundation'
2121
s.dependency 'Cache', '~> 5.0'
2222

23-
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.1' }
23+
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
2424
end

Imaginary.xcodeproj/project.pbxproj

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,7 @@
374374
BDE8FBE51D1BFB9F00C5A212 /* Frameworks */,
375375
BDE8FBE61D1BFB9F00C5A212 /* Headers */,
376376
BDE8FBE71D1BFB9F00C5A212 /* Resources */,
377-
BDE8FBF21D1BFBB300C5A212 /* ShellScript */,
378-
BDE8FBF11D1BFBAB00C5A212 /* ShellScript */,
377+
BDE8FBF21D1BFBB300C5A212 /* Carthage */,
379378
);
380379
buildRules = (
381380
);
@@ -450,7 +449,6 @@
450449
D5DF758D1C403D8200BF1AB6 /* Frameworks */,
451450
D5DF758E1C403D8200BF1AB6 /* Headers */,
452451
D5DF758F1C403D8200BF1AB6 /* Resources */,
453-
BD58C3AF1CF30382003F7141 /* ShellScript */,
454452
);
455453
buildRules = (
456454
);
@@ -555,45 +553,20 @@
555553
/* End PBXResourcesBuildPhase section */
556554

557555
/* Begin PBXShellScriptBuildPhase section */
558-
BD58C3AF1CF30382003F7141 /* ShellScript */ = {
559-
isa = PBXShellScriptBuildPhase;
560-
buildActionMask = 2147483647;
561-
files = (
562-
);
563-
inputPaths = (
564-
);
565-
outputPaths = (
566-
);
567-
runOnlyForDeploymentPostprocessing = 0;
568-
shellPath = /bin/sh;
569-
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
570-
};
571-
BDE8FBF11D1BFBAB00C5A212 /* ShellScript */ = {
572-
isa = PBXShellScriptBuildPhase;
573-
buildActionMask = 2147483647;
574-
files = (
575-
);
576-
inputPaths = (
577-
);
578-
outputPaths = (
579-
);
580-
runOnlyForDeploymentPostprocessing = 0;
581-
shellPath = /bin/sh;
582-
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
583-
};
584-
BDE8FBF21D1BFBB300C5A212 /* ShellScript */ = {
556+
BDE8FBF21D1BFBB300C5A212 /* Carthage */ = {
585557
isa = PBXShellScriptBuildPhase;
586558
buildActionMask = 2147483647;
587559
files = (
588560
);
589561
inputPaths = (
590562
"$(SRCROOT)/Carthage/Build/Mac/Cache.framework",
591563
);
564+
name = Carthage;
592565
outputPaths = (
593566
);
594567
runOnlyForDeploymentPostprocessing = 0;
595568
shellPath = /bin/sh;
596-
shellScript = "/usr/local/bin/carthage copy-frameworks";
569+
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
597570
};
598571
D21352FA1F75425600B5375B /* ShellScript */ = {
599572
isa = PBXShellScriptBuildPhase;

Sources/iOS/ImageViewDisplayer.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import UIKit
33
/// Used to set image onto ImageView
44
public class ImageViewDisplayer: ImageDisplayer {
55

6-
private let animationOption: UIViewAnimationOptions
6+
private let animationOption: UIView.AnimationOptions
77

8-
public init(animationOption: UIViewAnimationOptions = .transitionCrossDissolve) {
8+
public init(animationOption: UIView.AnimationOptions = .transitionCrossDissolve) {
99
self.animationOption = animationOption
1010
}
1111

0 commit comments

Comments
 (0)