Skip to content

Commit

Permalink
Use Swift 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
onmyway133 committed Sep 24, 2018
1 parent 2951506 commit e595d34
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 47 deletions.
3 changes: 0 additions & 3 deletions .mention-bot

This file was deleted.

2 changes: 1 addition & 1 deletion .swift-version
@@ -1 +1 @@
4.0
4.2
2 changes: 1 addition & 1 deletion Cartfile.resolved
@@ -1 +1 @@
github "hyperoslo/Cache" "5.1.0"
github "hyperoslo/Cache" "5.2.0"
4 changes: 2 additions & 2 deletions Example/ImaginaryDemo/ImaginaryDemo.xcodeproj/project.pbxproj
Expand Up @@ -182,7 +182,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-ImaginaryDemo/Pods-ImaginaryDemo-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-ImaginaryDemo/Pods-ImaginaryDemo-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Cache/Cache.framework",
"${BUILT_PRODUCTS_DIR}/Imaginary/Imaginary.framework",
);
Expand All @@ -193,7 +193,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImaginaryDemo/Pods-ImaginaryDemo-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ImaginaryDemo/Pods-ImaginaryDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down
10 changes: 5 additions & 5 deletions Example/ImaginaryDemo/Podfile.lock
@@ -1,6 +1,6 @@
PODS:
- Cache (5.1.0)
- Imaginary (4.0.0):
- Cache (5.2.0)
- Imaginary (4.2.0):
- Cache (~> 5.0)

DEPENDENCIES:
Expand All @@ -15,9 +15,9 @@ EXTERNAL SOURCES:
:path: "../../"

SPEC CHECKSUMS:
Cache: 7737c595aae7d94c7c0feca2c887288624e3b07e
Imaginary: 441fc8390e20f99e2025cc40643acc037e84dd30
Cache: 807c5d86d01a177f06ede9865add3aea269bbfd4
Imaginary: deadb35fdfc6cfbe25d1baf3f1e421929f577142

PODFILE CHECKSUM: 317cccf04e61f3f6f7e8a7e2dbc1ad0f7fa2beee

COCOAPODS: 1.5.3
COCOAPODS: 1.6.0.beta.1
4 changes: 2 additions & 2 deletions Imaginary.podspec
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "Imaginary"
s.summary = "Remote images, as easy as one, two, three."
s.version = "4.0.0"
s.version = "4.2.0"
s.homepage = "https://github.com/hyperoslo/Imaginary"
s.license = 'MIT'
s.author = { "Hyper Interaktiv AS" => "ios@hyper.no" }
Expand All @@ -20,5 +20,5 @@ Pod::Spec.new do |s|
s.frameworks = 'Foundation'
s.dependency 'Cache', '~> 5.0'

s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.1' }
s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
end
35 changes: 4 additions & 31 deletions Imaginary.xcodeproj/project.pbxproj
Expand Up @@ -374,8 +374,7 @@
BDE8FBE51D1BFB9F00C5A212 /* Frameworks */,
BDE8FBE61D1BFB9F00C5A212 /* Headers */,
BDE8FBE71D1BFB9F00C5A212 /* Resources */,
BDE8FBF21D1BFBB300C5A212 /* ShellScript */,
BDE8FBF11D1BFBAB00C5A212 /* ShellScript */,
BDE8FBF21D1BFBB300C5A212 /* Carthage */,
);
buildRules = (
);
Expand Down Expand Up @@ -450,7 +449,6 @@
D5DF758D1C403D8200BF1AB6 /* Frameworks */,
D5DF758E1C403D8200BF1AB6 /* Headers */,
D5DF758F1C403D8200BF1AB6 /* Resources */,
BD58C3AF1CF30382003F7141 /* ShellScript */,
);
buildRules = (
);
Expand Down Expand Up @@ -555,45 +553,20 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
BD58C3AF1CF30382003F7141 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
};
BDE8FBF11D1BFBAB00C5A212 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
};
BDE8FBF21D1BFBB300C5A212 /* ShellScript */ = {
BDE8FBF21D1BFBB300C5A212 /* Carthage */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(SRCROOT)/Carthage/Build/Mac/Cache.framework",
);
name = Carthage;
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks";
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
};
D21352FA1F75425600B5375B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
4 changes: 2 additions & 2 deletions Sources/iOS/ImageViewDisplayer.swift
Expand Up @@ -3,9 +3,9 @@ import UIKit
/// Used to set image onto ImageView
public class ImageViewDisplayer: ImageDisplayer {

private let animationOption: UIViewAnimationOptions
private let animationOption: UIView.AnimationOptions

public init(animationOption: UIViewAnimationOptions = .transitionCrossDissolve) {
public init(animationOption: UIView.AnimationOptions = .transitionCrossDissolve) {
self.animationOption = animationOption
}

Expand Down

0 comments on commit e595d34

Please sign in to comment.