From 404751752521b48486a75f6ce2807e5bb6a64542 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Thu, 21 Aug 2025 16:25:47 -0400 Subject: [PATCH 1/3] [DNM] Test grpc 1.69.1 --- Package.swift | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Package.swift b/Package.swift index f1f118874fb..5604eb0786b 100644 --- a/Package.swift +++ b/Package.swift @@ -1408,17 +1408,18 @@ func abseilDependency() -> Package.Dependency { } func grpcDependency() -> Package.Dependency { - let packageInfo: (url: String, range: Range) + return .package(url: "https://github.com/google/grpc-binary.git", branch: "ncooke3-patch-3") + // let packageInfo: (url: String, range: Range) - // If building Firestore from source, abseil will need to be built as source - // as the headers in the binary version of abseil are unusable. - if Context.environment["FIREBASE_SOURCE_FIRESTORE"] != nil { - packageInfo = ("https://github.com/grpc/grpc-ios.git", "1.69.0" ..< "1.70.0") - } else { - packageInfo = ("https://github.com/google/grpc-binary.git", "1.69.0" ..< "1.70.0") - } + // // If building Firestore from source, abseil will need to be built as source + // // as the headers in the binary version of abseil are unusable. + // if Context.environment["FIREBASE_SOURCE_FIRESTORE"] != nil { + // packageInfo = ("https://github.com/grpc/grpc-ios.git", "1.69.0" ..< "1.70.0") + // } else { + // packageInfo = ("https://github.com/google/grpc-binary.git", "1.69.0" ..< "1.70.0") + // } - return .package(url: packageInfo.url, packageInfo.range) + // return .package(url: packageInfo.url, packageInfo.range) } func firestoreWrapperTarget() -> Target { From 81f9bc32d6e5aa41ba441f4b438e43e7061563d7 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Thu, 21 Aug 2025 17:29:04 -0400 Subject: [PATCH 2/3] fix --- Package.swift | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Package.swift b/Package.swift index 5604eb0786b..fe93b41792f 100644 --- a/Package.swift +++ b/Package.swift @@ -1408,18 +1408,18 @@ func abseilDependency() -> Package.Dependency { } func grpcDependency() -> Package.Dependency { - return .package(url: "https://github.com/google/grpc-binary.git", branch: "ncooke3-patch-3") - // let packageInfo: (url: String, range: Range) + let packageInfo: (url: String, range: Range) - // // If building Firestore from source, abseil will need to be built as source - // // as the headers in the binary version of abseil are unusable. - // if Context.environment["FIREBASE_SOURCE_FIRESTORE"] != nil { - // packageInfo = ("https://github.com/grpc/grpc-ios.git", "1.69.0" ..< "1.70.0") - // } else { - // packageInfo = ("https://github.com/google/grpc-binary.git", "1.69.0" ..< "1.70.0") - // } + // If building Firestore from source, abseil will need to be built as source + // as the headers in the binary version of abseil are unusable. + if Context.environment["FIREBASE_SOURCE_FIRESTORE"] != nil { + packageInfo = ("https://github.com/grpc/grpc-ios.git", "1.69.0" ..< "1.70.0") + return .package(url: packageInfo.url, packageInfo.range) + } else { + packageInfo = ("https://github.com/google/grpc-binary.git", "1.69.0" ..< "1.70.0") + return .package(url: "https://github.com/google/grpc-binary.git", branch: "ncooke3-patch-3") + } - // return .package(url: packageInfo.url, packageInfo.range) } func firestoreWrapperTarget() -> Target { From 736d6bd63e75cb1e9295ff67c04c8922be4c66ad Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Thu, 21 Aug 2025 17:41:53 -0400 Subject: [PATCH 3/3] Update Package.swift --- Package.swift | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index fe93b41792f..8e42f0a1db4 100644 --- a/Package.swift +++ b/Package.swift @@ -1415,11 +1415,8 @@ func grpcDependency() -> Package.Dependency { if Context.environment["FIREBASE_SOURCE_FIRESTORE"] != nil { packageInfo = ("https://github.com/grpc/grpc-ios.git", "1.69.0" ..< "1.70.0") return .package(url: packageInfo.url, packageInfo.range) - } else { - packageInfo = ("https://github.com/google/grpc-binary.git", "1.69.0" ..< "1.70.0") - return .package(url: "https://github.com/google/grpc-binary.git", branch: "ncooke3-patch-3") } - + return .package(url: "https://github.com/google/grpc-binary.git", branch: "ncooke3-patch-3") } func firestoreWrapperTarget() -> Target {