Skip to content

Commit e1330d2

Browse files
bcylinbcylin
committed
Update outdated Pods
1 parent 4653b40 commit e1330d2

File tree

5 files changed

+63
-71
lines changed

5 files changed

+63
-71
lines changed

‎Podfile‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
source "https://github.com/CocoaPods/Specs.git"
22

3-
platform :tvos, "9.0"
3+
platform :tvos, "10.0"
44
use_frameworks!
55
inhibit_all_warnings!
66

77
workspace "iCookTV"
88
project "iCookTV"
99

1010
target :iCookTV do
11-
pod "Alamofire", "~> 4.2.0"
11+
pod "Alamofire", git: "https://github.com/Alamofire/Alamofire.git", tag: "4.8.2"
1212
pod "Crashlytics"
1313
pod "Fabric"
1414
pod "HCYoutubeParser"
15-
pod "Hue", "~> 2.0.0"
16-
pod "Kingfisher", "~> 3.2.0"
15+
pod "Hue", git: "https://github.com/zenangst/Hue.git", tag: "5.0.0"
16+
pod "Kingfisher", git: "https://github.com/onevcat/Kingfisher.git", tag: "5.7.0"
1717
pod "TreasureData-iOS-SDK", "0.1.15"
1818

1919
target :iCookTVTests do
20-
pod "SwiftLint", "0.24.0"
20+
pod "SwiftLint", podspec: "https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.34.0/SwiftLint.podspec.json"
2121
end
2222
end
2323

@@ -27,12 +27,3 @@ plugin "cocoapods-keys", {
2727
keys: ["BaseAPIURL", "CrashlyticsAPIKey", "TreasureDataAPIKey"]
2828
}
2929

30-
31-
# Specify Swift version in the configs for all the pods installed.
32-
post_install do |installer|
33-
installer.pods_project.targets.each do |target|
34-
target.build_configurations.each do |config|
35-
config.build_settings["SWIFT_VERSION"] = "3.0"
36-
end
37-
end
38-
end

‎Podfile.lock‎

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,74 @@
11
PODS:
2-
- Alamofire (4.2.0)
2+
- Alamofire (4.8.2)
33
- Crashlytics (3.8.3):
44
- Fabric (~> 1.6.3)
55
- Fabric (1.6.10)
66
- HCYoutubeParser (0.0.5)
7-
- Hue (2.0.1)
7+
- Hue (5.0.0)
88
- KeenClientTD (3.2.27)
99
- Keys (1.0.1)
10-
- Kingfisher (3.2.4)
11-
- SwiftLint (0.24.0)
10+
- Kingfisher (5.7.0)
11+
- SwiftLint (0.34.0)
1212
- TreasureData-iOS-SDK (0.1.15):
1313
- KeenClientTD (= 3.2.27)
1414

1515
DEPENDENCIES:
16-
- Alamofire (~> 4.2.0)
16+
- Alamofire (from `https://github.com/Alamofire/Alamofire.git`, tag `4.8.2`)
1717
- Crashlytics
1818
- Fabric
1919
- HCYoutubeParser
20-
- Hue (~> 2.0.0)
20+
- Hue (from `https://github.com/zenangst/Hue.git`, tag `5.0.0`)
2121
- Keys (from `Pods/CocoaPodsKeys`)
22-
- Kingfisher (~> 3.2.0)
23-
- SwiftLint (= 0.24.0)
22+
- Kingfisher (from `https://github.com/onevcat/Kingfisher.git`, tag `5.7.0`)
23+
- SwiftLint (from `https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.34.0/SwiftLint.podspec.json`)
2424
- TreasureData-iOS-SDK (= 0.1.15)
2525

26+
SPEC REPOS:
27+
https://github.com/cocoapods/specs.git:
28+
- Crashlytics
29+
- Fabric
30+
- HCYoutubeParser
31+
- KeenClientTD
32+
- TreasureData-iOS-SDK
33+
2634
EXTERNAL SOURCES:
35+
Alamofire:
36+
:git: https://github.com/Alamofire/Alamofire.git
37+
:tag: 4.8.2
38+
Hue:
39+
:git: https://github.com/zenangst/Hue.git
40+
:tag: 5.0.0
2741
Keys:
2842
:path: Pods/CocoaPodsKeys
43+
Kingfisher:
44+
:git: https://github.com/onevcat/Kingfisher.git
45+
:tag: 5.7.0
46+
SwiftLint:
47+
:podspec: https://raw.githubusercontent.com/CocoaPods/Specs/master/Specs/4/0/1/SwiftLint/0.34.0/SwiftLint.podspec.json
48+
49+
CHECKOUT OPTIONS:
50+
Alamofire:
51+
:git: https://github.com/Alamofire/Alamofire.git
52+
:tag: 4.8.2
53+
Hue:
54+
:git: https://github.com/zenangst/Hue.git
55+
:tag: 5.0.0
56+
Kingfisher:
57+
:git: https://github.com/onevcat/Kingfisher.git
58+
:tag: 5.7.0
2959

3060
SPEC CHECKSUMS:
31-
Alamofire: aa2e09d871c9160ac53c90e83c68064a94e3dfbe
61+
Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
3262
Crashlytics: 2b6dbe138a42395577cfa73dfa1aa7248cadf39e
3363
Fabric: c73f371ee543e3f0b80608f2674750e4910d1669
3464
HCYoutubeParser: bc1db8c062e4b835eda381f2be2f9970f6a8d071
35-
Hue: 354caec055fdc9d38b5ef33ca2e7224721843baf
65+
Hue: c129cb67be7d093a82bbbc30ce8a96757bf6f37a
3666
KeenClientTD: ddb29a702bd4cfce5d526519ca8959d70c324c6a
3767
Keys: a576f4c9c1c641ca913a959a9c62ed3f215a8de9
38-
Kingfisher: 8d80f39da403cd9c9ee11984e1655f4d6a566cdb
39-
SwiftLint: a014c92b4664e8b13f380f8640a51bb1733778ba
68+
Kingfisher: 5e1c7784a4e1052c2ed2f22dd4b19b1db74c837e
69+
SwiftLint: 79d48a17c6565dc286c37efb8322c7b450f95c67
4070
TreasureData-iOS-SDK: cc878af36b85ae3540a9a5bdb36b7bdc8707b719
4171

42-
PODFILE CHECKSUM: e5951c6489057187d3b6c52cfcfe304dc59eb489
72+
PODFILE CHECKSUM: 7d0f309956943494904766e181472b47d17e9494
4373

44-
COCOAPODS: 1.3.1
74+
COCOAPODS: 1.7.5

‎iCookTV.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,6 @@
376376
B5F7BF461BA9C95F00A75099 /* Resources */,
377377
B51A95351CCDFFEB00E5ED97 /* Run Fabric Script */,
378378
AA754957F6C9D01CFBA353B7 /* [CP] Embed Pods Frameworks */,
379-
EBDC1687F0692BDEB7D3F35D /* [CP] Copy Pods Resources */,
380379
);
381380
buildRules = (
382381
);
@@ -396,7 +395,6 @@
396395
B5F7BF561BA9C95F00A75099 /* Frameworks */,
397396
B5F7BF571BA9C95F00A75099 /* Resources */,
398397
D98BF45783F7971E01068E78 /* [CP] Embed Pods Frameworks */,
399-
274F955E84B2D8EB3E68D8D7 /* [CP] Copy Pods Resources */,
400398
);
401399
buildRules = (
402400
);
@@ -433,6 +431,7 @@
433431
developmentRegion = English;
434432
hasScannedForEncodings = 0;
435433
knownRegions = (
434+
English,
436435
en,
437436
Base,
438437
"zh-Hant",
@@ -489,21 +488,6 @@
489488
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";
490489
showEnvVarsInLog = 0;
491490
};
492-
274F955E84B2D8EB3E68D8D7 /* [CP] Copy Pods Resources */ = {
493-
isa = PBXShellScriptBuildPhase;
494-
buildActionMask = 2147483647;
495-
files = (
496-
);
497-
inputPaths = (
498-
);
499-
name = "[CP] Copy Pods Resources";
500-
outputPaths = (
501-
);
502-
runOnlyForDeploymentPostprocessing = 0;
503-
shellPath = /bin/sh;
504-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iCookTV-iCookTVTests/Pods-iCookTV-iCookTVTests-resources.sh\"\n";
505-
showEnvVarsInLog = 0;
506-
};
507491
9C2EB9E93A1775F7EBF52165 /* [CP] Check Pods Manifest.lock */ = {
508492
isa = PBXShellScriptBuildPhase;
509493
buildActionMask = 2147483647;
@@ -528,7 +512,7 @@
528512
files = (
529513
);
530514
inputPaths = (
531-
"${SRCROOT}/Pods/Target Support Files/Pods-iCookTV/Pods-iCookTV-frameworks.sh",
515+
"${PODS_ROOT}/Target Support Files/Pods-iCookTV/Pods-iCookTV-frameworks.sh",
532516
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
533517
"${BUILT_PRODUCTS_DIR}/HCYoutubeParser/HCYoutubeParser.framework",
534518
"${BUILT_PRODUCTS_DIR}/Hue/Hue.framework",
@@ -549,7 +533,7 @@
549533
);
550534
runOnlyForDeploymentPostprocessing = 0;
551535
shellPath = /bin/sh;
552-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iCookTV/Pods-iCookTV-frameworks.sh\"\n";
536+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iCookTV/Pods-iCookTV-frameworks.sh\"\n";
553537
showEnvVarsInLog = 0;
554538
};
555539
B51A95351CCDFFEB00E5ED97 /* Run Fabric Script */ = {
@@ -586,7 +570,7 @@
586570
files = (
587571
);
588572
inputPaths = (
589-
"${SRCROOT}/Pods/Target Support Files/Pods-iCookTV-iCookTVTests/Pods-iCookTV-iCookTVTests-frameworks.sh",
573+
"${PODS_ROOT}/Target Support Files/Pods-iCookTV-iCookTVTests/Pods-iCookTV-iCookTVTests-frameworks.sh",
590574
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
591575
"${BUILT_PRODUCTS_DIR}/HCYoutubeParser/HCYoutubeParser.framework",
592576
"${BUILT_PRODUCTS_DIR}/Hue/Hue.framework",
@@ -607,22 +591,7 @@
607591
);
608592
runOnlyForDeploymentPostprocessing = 0;
609593
shellPath = /bin/sh;
610-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iCookTV-iCookTVTests/Pods-iCookTV-iCookTVTests-frameworks.sh\"\n";
611-
showEnvVarsInLog = 0;
612-
};
613-
EBDC1687F0692BDEB7D3F35D /* [CP] Copy Pods Resources */ = {
614-
isa = PBXShellScriptBuildPhase;
615-
buildActionMask = 2147483647;
616-
files = (
617-
);
618-
inputPaths = (
619-
);
620-
name = "[CP] Copy Pods Resources";
621-
outputPaths = (
622-
);
623-
runOnlyForDeploymentPostprocessing = 0;
624-
shellPath = /bin/sh;
625-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iCookTV/Pods-iCookTV-resources.sh\"\n";
594+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iCookTV-iCookTVTests/Pods-iCookTV-iCookTVTests-frameworks.sh\"\n";
626595
showEnvVarsInLog = 0;
627596
};
628597
/* End PBXShellScriptBuildPhase section */
@@ -775,7 +744,7 @@
775744
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
776745
SWIFT_VERSION = 5.0;
777746
TARGETED_DEVICE_FAMILY = 3;
778-
TVOS_DEPLOYMENT_TARGET = 9.0;
747+
TVOS_DEPLOYMENT_TARGET = 10.0;
779748
};
780749
name = Debug;
781750
};
@@ -819,7 +788,7 @@
819788
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
820789
SWIFT_VERSION = 5.0;
821790
TARGETED_DEVICE_FAMILY = 3;
822-
TVOS_DEPLOYMENT_TARGET = 9.0;
791+
TVOS_DEPLOYMENT_TARGET = 10.0;
823792
VALIDATE_PRODUCT = YES;
824793
};
825794
name = Release;

‎iCookTV/Protocols/OverlayViewPresentable.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,10 @@ extension OverlayViewPresentable where Self: UIViewController {
6161
}
6262

6363
if let url = GroundControl.defaultBackgroundURL, !hidden {
64-
KingfisherManager.shared.downloader.downloadImage(with: url, completionHandler: { [weak self] image, _, _, _ in
64+
ImageDownloader.default.downloadImage(with: url, options: []) { [weak self] in
65+
let image = try? $0.get().image
6566
self?.updateBackground(with: image)
66-
})
67+
}
6768
}
6869
}
6970

‎iCookTV/Views/CategoryCell.swift‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class CategoryCell: UICollectionViewCell {
5252

5353
private let coverBuilder = CoverBuilder()
5454

55-
private var tasks = [Grid: RetrieveImageDownloadTask]()
55+
private var tasks = [Grid: DownloadTask]()
5656

5757
// MARK: - Initialization
5858

@@ -124,11 +124,12 @@ class CategoryCell: UICollectionViewCell {
124124
}
125125

126126
for (grid, url) in urls {
127-
let downloading = ImageDownloader.default.downloadImage(with: url, progressBlock: nil) { [weak self] image, _, imageURL, _ in
127+
let downloading = ImageDownloader.default.downloadImage(with: url, options: []) { [weak self] in
128128
self?.tasks[grid] = nil
129-
guard let image = image, imageURL == url else {
129+
guard let result = try? $0.get(), result.url == url else {
130130
return
131131
}
132+
let image = result.image
132133

133134
self?.coverBuilder.add(image: image, to: grid, categoryID: category.id) { newCover in
134135
if let current = self {

0 commit comments

Comments
 (0)