Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Commit f0a62aa

Browse files
BasThomasBasThomas
authored
Update CocoaPods and pods (#2650)
* Update all pods * Make the build build * Update CocoaPods and rerun pod install
1 parent 2cc5291 commit f0a62aa

File tree

243 files changed

+13240
-13694
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+13240
-13694
lines changed

‎Classes/Issues/IssuesViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ IssueManagingContextControllerDelegate {
572572
case .item(let item):
573573
guard item is IssueResult else { break }
574574
updateAndScrollIfNeeded()
575-
case .list: break
575+
case .list, .clear: break
576576
}
577577
}
578578

‎Classes/Systems/LocalNotificationsCache.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ final class LocalNotificationsCache {
1919

2020
private let path: String
2121
private lazy var queue: FMDatabaseQueue = {
22-
return FMDatabaseQueue(path: self.path)
22+
return FMDatabaseQueue(path: self.path)!
2323
}()
2424

2525
init(

‎Freetime.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
03C127B8220993300062F7C9 /* InboxZeroLoaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C127B7220993300062F7C9 /* InboxZeroLoaderTests.swift */; };
1011
03E8D824221D339200EB792A /* GithubURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E8D823221D339200EB792A /* GithubURL.swift */; };
1112
03E8D826221D358000EB792A /* GithubURLTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E8D825221D358000EB792A /* GithubURLTests.swift */; };
12-
03C127B8220993300062F7C9 /* InboxZeroLoaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03C127B7220993300062F7C9 /* InboxZeroLoaderTests.swift */; };
1313
0F9440FD32236514CD7215E9 /* Pods_Freetime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECF622FFD773FDA73297C0D0 /* Pods_Freetime.framework */; };
1414
15F28F992108DBA6006421B6 /* SplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15F28F982108DBA6006421B6 /* SplashView.swift */; };
1515
290056F3210028B20046EAE5 /* UIViewController+MenuDone.swift in Sources */ = {isa = PBXBuildFile; fileRef = 290056F2210028B20046EAE5 /* UIViewController+MenuDone.swift */; };
@@ -596,10 +596,9 @@
596596
/* End PBXCopyFilesBuildPhase section */
597597

598598
/* Begin PBXFileReference section */
599+
03C127B7220993300062F7C9 /* InboxZeroLoaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InboxZeroLoaderTests.swift; sourceTree = "<group>"; };
599600
03E8D823221D339200EB792A /* GithubURL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GithubURL.swift; sourceTree = "<group>"; };
600601
03E8D825221D358000EB792A /* GithubURLTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GithubURLTests.swift; sourceTree = "<group>"; };
601-
03A0EC6221F8F60B008C9CE2 /* RepositoryOverviewHeaderViewModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepositoryOverviewHeaderViewModels.swift; sourceTree = "<group>"; };
602-
03C127B7220993300062F7C9 /* InboxZeroLoaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InboxZeroLoaderTests.swift; sourceTree = "<group>"; };
603602
07C7DC5A7A907BE73BCA95AC /* Pods-FreetimeTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FreetimeTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FreetimeTests/Pods-FreetimeTests.debug.xcconfig"; sourceTree = "<group>"; };
604603
0F26A46A43D11F8D04E17D4A /* Pods-FreetimeWatch Extension.testflight.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FreetimeWatch Extension.testflight.xcconfig"; path = "Pods/Target Support Files/Pods-FreetimeWatch Extension/Pods-FreetimeWatch Extension.testflight.xcconfig"; sourceTree = "<group>"; };
605604
15F28F982108DBA6006421B6 /* SplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashView.swift; sourceTree = "<group>"; };
@@ -2706,7 +2705,7 @@
27062705
files = (
27072706
);
27082707
inputPaths = (
2709-
"${SRCROOT}/Pods/Target Support Files/Pods-Freetime/Pods-Freetime-frameworks.sh",
2708+
"${PODS_ROOT}/Target Support Files/Pods-Freetime/Pods-Freetime-frameworks.sh",
27102709
"${BUILT_PRODUCTS_DIR}/Alamofire-iOS/Alamofire.framework",
27112710
"${BUILT_PRODUCTS_DIR}/AlamofireNetworkActivityIndicator/AlamofireNetworkActivityIndicator.framework",
27122711
"${BUILT_PRODUCTS_DIR}/Apollo-iOS/Apollo.framework",
@@ -2769,7 +2768,7 @@
27692768
);
27702769
runOnlyForDeploymentPostprocessing = 0;
27712770
shellPath = /bin/sh;
2772-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Freetime/Pods-Freetime-frameworks.sh\"\n";
2771+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Freetime/Pods-Freetime-frameworks.sh\"\n";
27732772
showEnvVarsInLog = 0;
27742773
};
27752774
CB9D7CC581BBD847FBB3FBDA /* [CP] Check Pods Manifest.lock */ = {
@@ -2796,7 +2795,7 @@
27962795
files = (
27972796
);
27982797
inputPaths = (
2799-
"${SRCROOT}/Pods/Target Support Files/Pods-FreetimeWatch Extension/Pods-FreetimeWatch Extension-frameworks.sh",
2798+
"${PODS_ROOT}/Target Support Files/Pods-FreetimeWatch Extension/Pods-FreetimeWatch Extension-frameworks.sh",
28002799
"${BUILT_PRODUCTS_DIR}/Alamofire-watchOS/Alamofire.framework",
28012800
"${BUILT_PRODUCTS_DIR}/Apollo-watchOS/Apollo.framework",
28022801
"${BUILT_PRODUCTS_DIR}/DateAgo-watchOS/DateAgo.framework",
@@ -2815,7 +2814,7 @@
28152814
);
28162815
runOnlyForDeploymentPostprocessing = 0;
28172816
shellPath = /bin/sh;
2818-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FreetimeWatch Extension/Pods-FreetimeWatch Extension-frameworks.sh\"\n";
2817+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FreetimeWatch Extension/Pods-FreetimeWatch Extension-frameworks.sh\"\n";
28192818
showEnvVarsInLog = 0;
28202819
};
28212820
DCF1A6481F9E3E1F00A7A4A0 /* SwiftLint */ = {
@@ -2838,7 +2837,7 @@
28382837
files = (
28392838
);
28402839
inputPaths = (
2841-
"${SRCROOT}/Pods/Target Support Files/Pods-FreetimeTests/Pods-FreetimeTests-frameworks.sh",
2840+
"${PODS_ROOT}/Target Support Files/Pods-FreetimeTests/Pods-FreetimeTests-frameworks.sh",
28422841
"${BUILT_PRODUCTS_DIR}/Alamofire-iOS/Alamofire.framework",
28432842
"${BUILT_PRODUCTS_DIR}/AlamofireNetworkActivityIndicator/AlamofireNetworkActivityIndicator.framework",
28442843
"${BUILT_PRODUCTS_DIR}/Apollo-iOS/Apollo.framework",
@@ -2903,7 +2902,7 @@
29032902
);
29042903
runOnlyForDeploymentPostprocessing = 0;
29052904
shellPath = /bin/sh;
2906-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FreetimeTests/Pods-FreetimeTests-frameworks.sh\"\n";
2905+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FreetimeTests/Pods-FreetimeTests-frameworks.sh\"\n";
29072906
showEnvVarsInLog = 0;
29082907
};
29092908
/* End PBXShellScriptBuildPhase section */

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source 'https://rubygems.org'
22

3-
gem 'cocoapods', '~> 1.5.0'
3+
gem 'cocoapods'

‎Gemfile.lock‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,50 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
CFPropertyList (3.0.0)
5-
activesupport (4.2.10)
5+
activesupport (4.2.11)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
1010
atomos (0.1.3)
1111
claide (1.0.2)
12-
cocoapods (1.5.3)
12+
cocoapods (1.6.1)
1313
activesupport (>= 4.0.2, < 5)
1414
claide (>= 1.0.2, < 2.0)
15-
cocoapods-core (= 1.5.3)
15+
cocoapods-core (= 1.6.1)
1616
cocoapods-deintegrate (>= 1.0.2, < 2.0)
17-
cocoapods-downloader (>= 1.2.0, < 2.0)
17+
cocoapods-downloader (>= 1.2.2, < 2.0)
1818
cocoapods-plugins (>= 1.0.0, < 2.0)
1919
cocoapods-search (>= 1.0.0, < 2.0)
2020
cocoapods-stats (>= 1.0.0, < 2.0)
21-
cocoapods-trunk (>= 1.3.0, < 2.0)
21+
cocoapods-trunk (>= 1.3.1, < 2.0)
2222
cocoapods-try (>= 1.1.0, < 2.0)
2323
colored2 (~> 3.1)
2424
escape (~> 0.0.4)
25-
fourflusher (~> 2.0.1)
25+
fourflusher (>= 2.2.0, < 3.0)
2626
gh_inspector (~> 1.0)
27-
molinillo (~> 0.6.5)
27+
molinillo (~> 0.6.6)
2828
nap (~> 1.0)
29-
ruby-macho (~> 1.1)
30-
xcodeproj (>= 1.5.7, < 2.0)
31-
cocoapods-core (1.5.3)
29+
ruby-macho (~> 1.4)
30+
xcodeproj (>= 1.8.1, < 2.0)
31+
cocoapods-core (1.6.1)
3232
activesupport (>= 4.0.2, < 6)
3333
fuzzy_match (~> 2.0.4)
3434
nap (~> 1.0)
35-
cocoapods-deintegrate (1.0.2)
36-
cocoapods-downloader (1.2.1)
35+
cocoapods-deintegrate (1.0.3)
36+
cocoapods-downloader (1.2.2)
3737
cocoapods-plugins (1.0.0)
3838
nap
3939
cocoapods-search (1.0.0)
40-
cocoapods-stats (1.0.0)
40+
cocoapods-stats (1.1.0)
4141
cocoapods-trunk (1.3.1)
4242
nap (>= 0.8, < 2.0)
4343
netrc (~> 0.11)
4444
cocoapods-try (1.1.0)
4545
colored2 (3.1.2)
46-
concurrent-ruby (1.0.5)
46+
concurrent-ruby (1.1.4)
4747
escape (0.0.4)
48-
fourflusher (2.0.1)
48+
fourflusher (2.2.0)
4949
fuzzy_match (2.0.4)
5050
gh_inspector (1.1.3)
5151
i18n (0.9.5)
@@ -55,11 +55,11 @@ GEM
5555
nanaimo (0.2.6)
5656
nap (1.1.0)
5757
netrc (0.11.0)
58-
ruby-macho (1.3.1)
58+
ruby-macho (1.4.0)
5959
thread_safe (0.3.6)
6060
tzinfo (1.2.5)
6161
thread_safe (~> 0.1)
62-
xcodeproj (1.6.0)
62+
xcodeproj (1.8.1)
6363
CFPropertyList (>= 2.3.3, < 4.0)
6464
atomos (~> 0.1.3)
6565
claide (>= 1.0.2, < 2.0)
@@ -70,7 +70,7 @@ PLATFORMS
7070
ruby
7171

7272
DEPENDENCIES
73-
cocoapods (~> 1.5.0)
73+
cocoapods
7474

7575
BUNDLED WITH
76-
1.16.6
76+
2.0.1

‎Local Pods/GitHubAPI/GitHubAPI.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ Pod::Spec.new do |spec|
99
spec.source_files = 'GitHubAPI/*.swift'
1010
spec.ios.deployment_target = '11.0'
1111
spec.watchos.deployment_target = '3.0'
12-
spec.dependency 'Alamofire', '~> 4.4.0'
12+
spec.dependency 'Alamofire', '~> 4.8'
1313
spec.dependency 'Apollo', '~> 0.8.0'
1414
end

‎Local Pods/GitHubAPI/GitHubAPI.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@
312312
29C1A9C4204B04E700CB6995 /* Frameworks */,
313313
29C1A9C5204B04E700CB6995 /* Headers */,
314314
29C1A9C6204B04E700CB6995 /* Resources */,
315-
194E66530342DB47B45A7BF0 /* [CP] Copy Pods Resources */,
316315
);
317316
buildRules = (
318317
);
@@ -332,7 +331,6 @@
332331
29C1A9E8204B22A200CB6995 /* Frameworks */,
333332
29C1A9E9204B22A200CB6995 /* Resources */,
334333
3B6B9145FE20152CB75021DA /* [CP] Embed Pods Frameworks */,
335-
9D12A259126E3CCD34AB0312 /* [CP] Copy Pods Resources */,
336334
);
337335
buildRules = (
338336
);
@@ -405,28 +403,13 @@
405403
/* End PBXResourcesBuildPhase section */
406404

407405
/* Begin PBXShellScriptBuildPhase section */
408-
194E66530342DB47B45A7BF0 /* [CP] Copy Pods Resources */ = {
409-
isa = PBXShellScriptBuildPhase;
410-
buildActionMask = 2147483647;
411-
files = (
412-
);
413-
inputPaths = (
414-
);
415-
name = "[CP] Copy Pods Resources";
416-
outputPaths = (
417-
);
418-
runOnlyForDeploymentPostprocessing = 0;
419-
shellPath = /bin/sh;
420-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GitHubAPI/Pods-GitHubAPI-resources.sh\"\n";
421-
showEnvVarsInLog = 0;
422-
};
423406
3B6B9145FE20152CB75021DA /* [CP] Embed Pods Frameworks */ = {
424407
isa = PBXShellScriptBuildPhase;
425408
buildActionMask = 2147483647;
426409
files = (
427410
);
428411
inputPaths = (
429-
"${SRCROOT}/Pods/Target Support Files/Pods-GitHubAPITests/Pods-GitHubAPITests-frameworks.sh",
412+
"${PODS_ROOT}/Target Support Files/Pods-GitHubAPITests/Pods-GitHubAPITests-frameworks.sh",
430413
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
431414
"${BUILT_PRODUCTS_DIR}/Apollo/Apollo.framework",
432415
);
@@ -437,7 +420,7 @@
437420
);
438421
runOnlyForDeploymentPostprocessing = 0;
439422
shellPath = /bin/sh;
440-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GitHubAPITests/Pods-GitHubAPITests-frameworks.sh\"\n";
423+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GitHubAPITests/Pods-GitHubAPITests-frameworks.sh\"\n";
441424
showEnvVarsInLog = 0;
442425
};
443426
83D888E1E8CA52543AA10A44 /* [CP] Check Pods Manifest.lock */ = {
@@ -476,21 +459,6 @@
476459
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";
477460
showEnvVarsInLog = 0;
478461
};
479-
9D12A259126E3CCD34AB0312 /* [CP] Copy Pods Resources */ = {
480-
isa = PBXShellScriptBuildPhase;
481-
buildActionMask = 2147483647;
482-
files = (
483-
);
484-
inputPaths = (
485-
);
486-
name = "[CP] Copy Pods Resources";
487-
outputPaths = (
488-
);
489-
runOnlyForDeploymentPostprocessing = 0;
490-
shellPath = /bin/sh;
491-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GitHubAPITests/Pods-GitHubAPITests-resources.sh\"\n";
492-
showEnvVarsInLog = 0;
493-
};
494462
/* End PBXShellScriptBuildPhase section */
495463

496464
/* Begin PBXSourcesBuildPhase section */

‎Local Pods/GitHubAPI/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inhibit_all_warnings!
55

66
target 'GitHubAPI' do
77

8-
pod 'Alamofire', '~> 4.4.0'
8+
pod 'Alamofire', '~> 4.8'
99
pod 'Apollo', '~> 0.8.0'
1010

1111
end

‎Local Pods/GitHubAPI/Podfile.lock‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
PODS:
2-
- Alamofire (4.4.0)
2+
- Alamofire (4.8.1)
33
- Apollo (0.8.0):
44
- Apollo/Core (= 0.8.0)
55
- Apollo/Core (0.8.0)
66

77
DEPENDENCIES:
8-
- Alamofire (~> 4.4.0)
8+
- Alamofire (~> 4.8)
99
- Apollo (~> 0.8.0)
1010

11+
SPEC REPOS:
12+
https://github.com/cocoapods/specs.git:
13+
- Alamofire
14+
- Apollo
15+
1116
SPEC CHECKSUMS:
12-
Alamofire: dc44b1600b800eb63da6a19039a0083d62a6a62d
17+
Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
1318
Apollo: 66e0f52289551545adb7ecdd994e713fdbae26eb
1419

15-
PODFILE CHECKSUM: 6176181ce3dbc3f4cb8b568d4410d0c1e5bca2bf
20+
PODFILE CHECKSUM: 3f8cf6f74c2e7d8f1a6b4cce8fa1cb3d66d29473
1621

17-
COCOAPODS: 1.4.0
22+
COCOAPODS: 1.6.1

‎Local Pods/GitHubAPI/Pods/Alamofire/LICENSE‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)