Merge branch 'main' into ah/combine-core-dep

FirebaseCombineSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCombineSwift'
-  s.version          = '11.0.0'
+  s.version          = '11.6.0'
   s.summary          = 'Swift extensions with Combine support for Firebase'
 
   s.description      = <<-DESC

ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift

@@ -55,6 +55,7 @@ public let shared = Manifest(
     Pod("FirebaseMLModelDownloader", isBeta: true, zip: true),
     Pod("FirebaseVertexAI", zip: true),
     Pod("Firebase", allowWarnings: true, platforms: ["ios", "tvos", "macos"], zip: true),
+    Pod("FirebaseCombineSwift", releasing: false, zip: false),
   ]
 )
 
@@ -64,6 +65,7 @@ public struct Manifest {
   public let pods: [Pod]
 
   public func versionString(_ pod: Pod) -> String {
+    let version = pod.podVersion ?? self.version
     return pod.isBeta ? version + "-beta" : version
   }
 }

ReleaseTooling/Sources/FirebaseManifest/Pod.swift

@@ -28,6 +28,8 @@ public struct Pod {
   public let allowWarnings: Bool
   /// Set of platforms (e.g. "ios", "macos", "tvos", or "watchos") to build this pod for.
   public let platforms: Set<String>
+  /// Allows overriding the ``Manifest/version`` for this pod; defaults to `nil`.
+  public let podVersion: String?
   /// Whether or not the pod is planned for publicly releasing (as some pods are for
   /// internal/testing use).
   public let releasing: Bool
@@ -47,6 +49,7 @@ public struct Pod {
     self.isBeta = isBeta
     self.allowWarnings = allowWarnings
     self.platforms = platforms
+    self.podVersion = podVersion
     self.releasing = releasing
     self.zip = zip
   }

ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift

@@ -361,7 +361,7 @@ struct ZipBuilder {
   /// - Throws: One of many errors that could have happened during the build phase.
   func buildAndAssembleFirebaseRelease(templateDir: URL) throws -> ReleaseArtifacts {
     let manifest = FirebaseManifest.shared
-    var podsToInstall = manifest.pods.map {
+    var podsToInstall = manifest.pods.filter { $0.releasing }.map {
       CocoaPodUtils.VersionedPod(name: $0.name,
                                  version: manifest.versionString($0),
                                  platforms: $0.platforms)