Skip to content

Fix ZipBuilder crash and warning #6653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 5, 2020
Merged

Fix ZipBuilder crash and warning #6653

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59faaba
Fix ZipBuilder crash and warning
paulb777 Oct 3, 2020
902e07d
Restore cron after successful zip package
paulb777 Oct 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ZipBuilder/Sources/ZipBuilder/CocoaPodUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ enum CocoaPodUtils {
static func cleanPodCache() {
let result = Shell.executeCommandFromScript("pod cache clean --all", outputToConsole: false)
switch result {
case let .error(code):
case let .error(code, _):
fatalError("Could not clean the pod cache, the command exited with \(code). Try running the" +
"command in Terminal to see what's wrong.")
case .success:
Expand Down Expand Up @@ -413,15 +413,23 @@ enum CocoaPodUtils {

// Loop through the subspecs passed in and use the actual Pod name.
for pod in pods {
podfile += " pod '\(pod.name)'"
let podspec = String(pod.name.split(separator: "/")[0] + ".podspec")
// Check if we want to use a local version of the podspec.
if let localURL = LaunchArgs.shared.localPodspecPath,
FileManager.default
.fileExists(atPath: localURL.appendingPathComponent(podspec).path) {
podfile += ", :path => '\(localURL.path)'"
podfile += " pod '\(pod.name)', :path => '\(localURL.path)'"
} else if let podVersion = pod.version {
podfile += ", '\(podVersion)'"
podfile += " pod '\(pod.name)', '\(podVersion)'"
} else if pod.name.starts(with: "Firebase"),
let localURL = LaunchArgs.shared.localPodspecPath,
FileManager.default
.fileExists(atPath: localURL.appendingPathComponent("Firebase.podspec").path) {
// Let Firebase.podspec force the right version for unspecified closed Firebase pods.
let podString = pod.name.replacingOccurrences(of: "Firebase", with: "")
podfile += " pod 'Firebase/\(podString)', :path => '\(localURL.path)'"
} else {
podfile += " pod '\(pod.name)'"
}
if pod.version != nil {
// Don't add Google pods if versions were specified or we're doing a secondary install
Expand Down