Skip to content

Add new GoogleSignIn Swift pod to zip distro #9905

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 3 commits into from
Jun 14, 2022
Merged

Add new GoogleSignIn Swift pod to zip distro #9905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c41591e
Add new GoogleSignIn Swift pod to zip distro
paulb777 Jun 13, 2022
c5992bc
fixes
paulb777 Jun 14, 2022
43d24e9
Changelog
paulb777 Jun 14, 2022
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
3 changes: 3 additions & 0 deletions FirebaseCore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Firebase 9.2.0
- [added] Zip and Carthage distributions now include GoogleSignInSwiftSupport. (#9900)

# Firebase 9.0.0
- [changed] Firebase now requires at least Xcode 13.3.1.
- [deprecated] Usage of the Firebase pod, the Firebase module (`import Firebase`), and `Firebase.h`
Expand Down
9 changes: 5 additions & 4 deletions ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ struct ZipBuilder {
podsToInstall.append(CocoaPodUtils.VersionedPod(name: "Google-Mobile-Ads-SDK",
version: nil,
platforms: ["ios"]))
podsToInstall.append(CocoaPodUtils.VersionedPod(name: "GoogleSignIn",
podsToInstall.append(CocoaPodUtils.VersionedPod(name: "GoogleSignInSwiftSupport",
version: nil,
platforms: ["ios"]))

Expand Down Expand Up @@ -440,14 +440,15 @@ struct ZipBuilder {
// Skip Analytics and the pods bundled with it.
let remainingPods = installedPods.filter {
$0.key == "Google-Mobile-Ads-SDK" ||
$0.key == "GoogleSignIn" ||
$0.key == "GoogleSignInSwiftSupport" ||
(firebaseZipPods.contains($0.key) &&
$0.key != "FirebaseAnalyticsSwift" &&
$0.key != "Firebase" &&
podsToInstall.map { $0.name }.contains($0.key))
}.sorted { $0.key < $1.key }
for pod in remainingPods {
let folder = pod.key.replacingOccurrences(of: "Swift", with: "")
let folder = pod.key == "GoogleSignInSwiftSupport" ? "GoogleSignIn" :
pod.key.replacingOccurrences(of: "Swift", with: "")
do {
if frameworksToAssemble[pod.key] == nil {
// Continue if the pod wasn't built.
Expand Down Expand Up @@ -685,7 +686,7 @@ struct ZipBuilder {
/// Describes the dependency on other frameworks for the README file.
func readmeHeader(podName: String) -> String {
var header = "## \(podName)"
if !(podName == "FirebaseAnalytics" || podName == "GoogleSignIn") {
if !(podName == "FirebaseAnalytics" || podName == "GoogleSignInSwiftSupport") {
header += " (~> FirebaseAnalytics)"
}
header += "\n"
Expand Down