Skip to content

Commit 86b4777

Browse files
committed
Updates to enable Firebase main in dev and test
1 parent 934a23f commit 86b4777

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.github/workflows/spm.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
target: [iOS, tvOS, macOS, catalyst, visionOS]
3434
xcode: [Xcode_15.2, Xcode_15.4, Xcode_16_Release_Candidate]
3535
runs-on: ${{ matrix.os }}
36+
env:
37+
FIREBASE_MAIN: 1
3638
steps:
3739
- uses: actions/checkout@v4
3840
- name: Xcode

Package.swift

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ let package = Package(
2929
),
3030
],
3131
dependencies: [
32-
.package(url: "https://github.com/firebase/firebase-ios-sdk",
33-
branch: "nc/demo-reg"),
32+
firebaseDependency(),
3433
.package(
3534
url: "https://github.com/grpc/grpc-swift.git",
3635
from: "1.19.1" // TODO: Constrain to a range at time of release
@@ -41,6 +40,8 @@ let package = Package(
4140
name: "FirebaseDataConnect",
4241
dependencies: [
4342
.product(name: "GRPC", package: "grpc-swift"),
43+
.product(name: "FirebaseCore", package: "firebase-ios-sdk"),
44+
// TODO: Investigate switching Auth and AppCheck to interop.
4445
.product(name: "FirebaseAuth", package: "firebase-ios-sdk"),
4546
.product(name: "FirebaseAppCheck", package: "firebase-ios-sdk"),
4647

@@ -54,3 +55,15 @@ let package = Package(
5455
),
5556
]
5657
)
58+
59+
func firebaseDependency() -> Package.Dependency {
60+
let firebaseURL = "https://github.com/firebase/firebase-ios-sdk"
61+
62+
// Point SPM CI to the tip of main of https://github.com/firebase/firebase-ios-sdk so that the
63+
// release process can defer publishing the GoogleAppMeasurement tag until after testing.
64+
if ProcessInfo.processInfo.environment["FIREBASE_MAIN"] != nil {
65+
return .package(url: firebaseURL, branch: "main")
66+
}
67+
68+
return .package(url: firebaseURL, exact: "11.3.0")
69+
}

0 commit comments

Comments
 (0)