Skip to content

Commit

Permalink
Update CocoaPods and pods (GitHawkApp#2650)
Browse files Browse the repository at this point in the history
* Update all pods

* Make the build build

* Update CocoaPods and rerun pod install
  • Loading branch information
BasThomas authored Feb 22, 2019
1 parent 2cc5291 commit f0a62aa
Show file tree
Hide file tree
Showing 243 changed files with 13,240 additions and 13,694 deletions.
2 changes: 1 addition & 1 deletion Classes/Issues/IssuesViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ IssueManagingContextControllerDelegate {
case .item(let item):
guard item is IssueResult else { break }
updateAndScrollIfNeeded()
case .list: break
case .list, .clear: break
}
}

Expand Down
2 changes: 1 addition & 1 deletion Classes/Systems/LocalNotificationsCache.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ final class LocalNotificationsCache {

private let path: String
private lazy var queue: FMDatabaseQueue = {
return FMDatabaseQueue(path: self.path)
return FMDatabaseQueue(path: self.path)!
}()

init(
Expand Down
17 changes: 8 additions & 9 deletions Freetime.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
objects = {

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

/* Begin PBXFileReference section */
03C127B7220993300062F7C9 /* InboxZeroLoaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InboxZeroLoaderTests.swift; sourceTree = "<group>"; };
03E8D823221D339200EB792A /* GithubURL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GithubURL.swift; sourceTree = "<group>"; };
03E8D825221D358000EB792A /* GithubURLTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GithubURLTests.swift; sourceTree = "<group>"; };
03A0EC6221F8F60B008C9CE2 /* RepositoryOverviewHeaderViewModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepositoryOverviewHeaderViewModels.swift; sourceTree = "<group>"; };
03C127B7220993300062F7C9 /* InboxZeroLoaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InboxZeroLoaderTests.swift; sourceTree = "<group>"; };
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>"; };
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>"; };
15F28F982108DBA6006421B6 /* SplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2706,7 +2705,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Freetime/Pods-Freetime-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-Freetime/Pods-Freetime-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Alamofire-iOS/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/AlamofireNetworkActivityIndicator/AlamofireNetworkActivityIndicator.framework",
"${BUILT_PRODUCTS_DIR}/Apollo-iOS/Apollo.framework",
Expand Down Expand Up @@ -2769,7 +2768,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Freetime/Pods-Freetime-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Freetime/Pods-Freetime-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
CB9D7CC581BBD847FBB3FBDA /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -2796,7 +2795,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-FreetimeWatch Extension/Pods-FreetimeWatch Extension-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-FreetimeWatch Extension/Pods-FreetimeWatch Extension-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Alamofire-watchOS/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/Apollo-watchOS/Apollo.framework",
"${BUILT_PRODUCTS_DIR}/DateAgo-watchOS/DateAgo.framework",
Expand All @@ -2815,7 +2814,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FreetimeWatch Extension/Pods-FreetimeWatch Extension-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FreetimeWatch Extension/Pods-FreetimeWatch Extension-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
DCF1A6481F9E3E1F00A7A4A0 /* SwiftLint */ = {
Expand All @@ -2838,7 +2837,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-FreetimeTests/Pods-FreetimeTests-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-FreetimeTests/Pods-FreetimeTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Alamofire-iOS/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/AlamofireNetworkActivityIndicator/AlamofireNetworkActivityIndicator.framework",
"${BUILT_PRODUCTS_DIR}/Apollo-iOS/Apollo.framework",
Expand Down Expand Up @@ -2903,7 +2902,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FreetimeTests/Pods-FreetimeTests-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FreetimeTests/Pods-FreetimeTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source 'https://rubygems.org'

gem 'cocoapods', '~> 1.5.0'
gem 'cocoapods'
38 changes: 19 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,50 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
activesupport (4.2.10)
activesupport (4.2.11)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.5.3)
cocoapods (1.6.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.3)
cocoapods-core (= 1.6.1)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
fourflusher (>= 2.2.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.5)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.5.7, < 2.0)
cocoapods-core (1.5.3)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.1, < 2.0)
cocoapods-core (1.6.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.2.1)
cocoapods-deintegrate (1.0.3)
cocoapods-downloader (1.2.2)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.4)
escape (0.0.4)
fourflusher (2.0.1)
fourflusher (2.2.0)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
i18n (0.9.5)
Expand All @@ -55,11 +55,11 @@ GEM
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
ruby-macho (1.3.1)
ruby-macho (1.4.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.6.0)
xcodeproj (1.8.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -70,7 +70,7 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.5.0)
cocoapods

BUNDLED WITH
1.16.6
2.0.1
2 changes: 1 addition & 1 deletion Local Pods/GitHubAPI/GitHubAPI.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ Pod::Spec.new do |spec|
spec.source_files = 'GitHubAPI/*.swift'
spec.ios.deployment_target = '11.0'
spec.watchos.deployment_target = '3.0'
spec.dependency 'Alamofire', '~> 4.4.0'
spec.dependency 'Alamofire', '~> 4.8'
spec.dependency 'Apollo', '~> 0.8.0'
end
36 changes: 2 additions & 34 deletions Local Pods/GitHubAPI/GitHubAPI.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@
29C1A9C4204B04E700CB6995 /* Frameworks */,
29C1A9C5204B04E700CB6995 /* Headers */,
29C1A9C6204B04E700CB6995 /* Resources */,
194E66530342DB47B45A7BF0 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -332,7 +331,6 @@
29C1A9E8204B22A200CB6995 /* Frameworks */,
29C1A9E9204B22A200CB6995 /* Resources */,
3B6B9145FE20152CB75021DA /* [CP] Embed Pods Frameworks */,
9D12A259126E3CCD34AB0312 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -405,28 +403,13 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
194E66530342DB47B45A7BF0 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GitHubAPI/Pods-GitHubAPI-resources.sh\"\n";
showEnvVarsInLog = 0;
};
3B6B9145FE20152CB75021DA /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-GitHubAPITests/Pods-GitHubAPITests-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-GitHubAPITests/Pods-GitHubAPITests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/Apollo/Apollo.framework",
);
Expand All @@ -437,7 +420,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GitHubAPITests/Pods-GitHubAPITests-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GitHubAPITests/Pods-GitHubAPITests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
83D888E1E8CA52543AA10A44 /* [CP] Check Pods Manifest.lock */ = {
Expand Down Expand Up @@ -476,21 +459,6 @@
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";
showEnvVarsInLog = 0;
};
9D12A259126E3CCD34AB0312 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GitHubAPITests/Pods-GitHubAPITests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down
2 changes: 1 addition & 1 deletion Local Pods/GitHubAPI/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inhibit_all_warnings!

target 'GitHubAPI' do

pod 'Alamofire', '~> 4.4.0'
pod 'Alamofire', '~> 4.8'
pod 'Apollo', '~> 0.8.0'

end
Expand Down
15 changes: 10 additions & 5 deletions Local Pods/GitHubAPI/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
PODS:
- Alamofire (4.4.0)
- Alamofire (4.8.1)
- Apollo (0.8.0):
- Apollo/Core (= 0.8.0)
- Apollo/Core (0.8.0)

DEPENDENCIES:
- Alamofire (~> 4.4.0)
- Alamofire (~> 4.8)
- Apollo (~> 0.8.0)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Alamofire
- Apollo

SPEC CHECKSUMS:
Alamofire: dc44b1600b800eb63da6a19039a0083d62a6a62d
Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
Apollo: 66e0f52289551545adb7ecdd994e713fdbae26eb

PODFILE CHECKSUM: 6176181ce3dbc3f4cb8b568d4410d0c1e5bca2bf
PODFILE CHECKSUM: 3f8cf6f74c2e7d8f1a6b4cce8fa1cb3d66d29473

COCOAPODS: 1.4.0
COCOAPODS: 1.6.1
2 changes: 1 addition & 1 deletion Local Pods/GitHubAPI/Pods/Alamofire/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f0a62aa

Please sign in to comment.