Zip: Stop including Swift specific frameworks (#12080)

Author: paulb777

ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift

@@ -34,30 +34,29 @@ public let shared = Manifest(
     Pod("FirebaseSessions"),
     Pod("GoogleAppMeasurement", isClosedSource: true),
     Pod("GoogleAppMeasurementOnDeviceConversion", isClosedSource: true, platforms: ["ios"]),
-    Pod("FirebaseAnalytics", isClosedSource: true),
+    Pod("FirebaseAnalytics", isClosedSource: true, zip: true),
     Pod("FirebaseAnalyticsOnDeviceConversion", platforms: ["ios"], zip: true),
-    Pod("FirebaseAnalyticsSwift", allowWarnings: true, zip: true),
+    Pod("FirebaseAnalyticsSwift", allowWarnings: true),
     Pod("FirebaseABTesting", zip: true),
     Pod("FirebaseAppCheck", zip: true),
-    Pod("FirebaseRemoteConfig"),
-    Pod("FirebaseRemoteConfigSwift", allowWarnings: true, zip: true),
+    Pod("FirebaseRemoteConfig", zip: true),
+    Pod("FirebaseRemoteConfigSwift", allowWarnings: true),
     Pod("FirebaseAppDistribution", isBeta: true, platforms: ["ios"], zip: true),
     Pod("FirebaseAuth", zip: true),
     Pod("FirebaseCrashlytics", zip: true),
-    Pod("FirebaseDatabase"),
-    Pod("FirebaseDatabaseSwift", allowWarnings: true, zip: true),
+    Pod("FirebaseDatabase", zip: true),
+    Pod("FirebaseDatabaseSwift", allowWarnings: true),
     Pod("FirebaseDynamicLinks", platforms: ["ios"], zip: true),
     Pod("FirebaseFirestoreInternal", allowWarnings: true),
-    Pod("FirebaseFirestore", allowWarnings: true),
-    Pod("FirebaseFirestoreSwift", allowWarnings: true, zip: true),
+    Pod("FirebaseFirestore", allowWarnings: true, zip: true),
+    Pod("FirebaseFirestoreSwift", allowWarnings: true),
     Pod("FirebaseFunctions", zip: true),
-    Pod("FirebaseInAppMessaging", isBeta: true, platforms: ["ios"]),
+    Pod("FirebaseInAppMessaging", isBeta: true, platforms: ["ios"], zip: true),
     Pod(
       "FirebaseInAppMessagingSwift",
       isBeta: true,
       allowWarnings: true,
-      platforms: ["ios"],
-      zip: true
+      platforms: ["ios"]
     ),
     Pod("FirebaseMessaging", zip: true),
     Pod("FirebasePerformance", platforms: ["ios", "tvos"], zip: true),

ReleaseTooling/Sources/ZipBuilder/CarthageUtils.swift

@@ -107,7 +107,7 @@ extension CarthageUtils {
 
       // Analytics includes all the Core frameworks and Firebase module, do extra work to package
       // it.
-      if product == "FirebaseAnalyticsSwift" {
+      if product == "FirebaseAnalytics" {
         createFirebaseFramework(version: firebaseVersion,
                                 inDir: fullPath,
                                 rootDir: packagedDir,

ReleaseTooling/Sources/ZipBuilder/CocoaPodUtils.swift

@@ -494,8 +494,7 @@ enum CocoaPodUtils {
         podfile += "  pod '\(pod.name)', :path => '\(localURL.path)'"
       } else if let podVersion = pod.version {
         // To support Firebase patch versions in the Firebase zip distribution, allow patch updates
-        // for all pods except Firebase and FirebaseCore. The Firebase Swift pods are not yet in the
-        // zip distribution.
+        // for all pods except Firebase and FirebaseCore.
         var podfileVersion = podVersion
         if pod.name.starts(with: "Firebase"),
            !pod.name.hasSuffix("Swift"),

ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift

@@ -408,7 +408,7 @@ struct ZipBuilder {
     do {
       // This returns the Analytics directory and a list of framework names that Analytics requires.
       /// Example: ["FirebaseInstallations, "GoogleAppMeasurement", "nanopb", <...>]
-      let (dir, frameworks) = try installAndCopyFrameworks(forPod: "FirebaseAnalyticsSwift",
+      let (dir, frameworks) = try installAndCopyFrameworks(forPod: "FirebaseAnalytics",
                                                            inFolder: "FirebaseAnalytics",
                                                            withInstalledPods: installedPods,
                                                            rootZipDir: zipDir,
@@ -420,7 +420,7 @@ struct ZipBuilder {
     }
 
     // Start the README dependencies string with the frameworks built in Analytics.
-    var metadataDeps = dependencyString(for: "FirebaseAnalyticsSwift",
+    var metadataDeps = dependencyString(for: "FirebaseAnalytics",
                                         in: analyticsDir,
                                         frameworks: analyticsFrameworks)
 
@@ -437,7 +437,7 @@ struct ZipBuilder {
       $0.key == "Google-Mobile-Ads-SDK" ||
         $0.key == "GoogleSignIn" ||
         (firebaseZipPods.contains($0.key) &&
-          $0.key != "FirebaseAnalyticsSwift" &&
+          $0.key != "FirebaseAnalytics" &&
           $0.key != "Firebase" &&
           podsToInstall.map { $0.name }.contains($0.key))
     }.sorted { $0.key < $1.key }

ReleaseTooling/Template/README.md

@@ -27,10 +27,6 @@ To integrate a Firebase SDK with your app:
    > ⚠ To disable AdId support, do not copy
    > `GoogleAppMeasurementIdentitySupport.xcframework`.
 
-   > ⚠ If the app does not use any Firebase Swift specific APIs, you do not need
-   > to copy any xcframeworks whose name includes `Swift` for this and the next
-   > step.
-
 6. Drag each framework from the directory named after the SDK into the Project
    Navigator pane. Note that there may be no additional frameworks, in which
    case this directory will be empty. For instance, if you want the Database