Skip to content
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.

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

[Release] Add FirebaseCombineSwift to FirebaseManifest #14110

Merged
merged 3 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions FirebaseCombineSwift.podspec
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -51,7 +51,7 @@ for internal testing only. It should not be published.
s.osx.framework = 'AppKit'
s.tvos.framework = 'UIKit'

s.dependency 'FirebaseCore', '11.5'
s.dependency 'FirebaseCore', '11.6.0'
s.dependency 'FirebaseAuth', '~> 11.0'
s.dependency 'FirebaseFunctions', '~> 11.0'
s.dependency 'FirebaseFirestore', '~> 11.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
]
)

Expand All @@ -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
}
}
3 changes: 3 additions & 0 deletions ReleaseTooling/Sources/FirebaseManifest/Pod.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading