Skip to content

ZipBuilder workaround #7286

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 1 commit into from
Jan 12, 2021
Merged

ZipBuilder workaround #7286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,12 @@ struct ZipBuilder {
}
}
// Union all pods built across platforms.
podsBuilt[podName] = podInfo
// Be conservative and favor iOS if it exists - and workaround
// bug where Firebase.h doesn't get installed for tvOS and macOS.
// Fixed in #7284.
if podsBuilt[podName] == nil {
podsBuilt[podName] = podInfo
}
Comment on lines +247 to +252
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will only work if iOS is specified first, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right.

}
}

Expand Down