From e3d3eff45fb70c1aee081eb9b0ccc63571f061e1 Mon Sep 17 00:00:00 2001
From: austinbenoit <austinbenoit@google.com>
Date: Thu, 22 Oct 2026 05:21:26 +0000
Subject: [PATCH 1/2] WIP

---
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 cmake/external/firestore.cmake                       |  2 +-
 cmake/external/firestore.patch.txt                   | 12 ------------
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 ios_spm/Package.swift                                |  2 +-
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 scripts/gha/build_testapps.py                        |  1 +
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 .../integration_test.xcodeproj/project.pbxproj       |  4 ++--
 17 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj
index 1cf66dc9c0..56472a10a1 100644
--- a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -587,8 +587,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/app/integration_test/integration_test.xcodeproj/project.pbxproj b/app/integration_test/integration_test.xcodeproj/project.pbxproj
index 475f04d854..7c7e70da27 100644
--- a/app/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/app/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -366,8 +366,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj
index f87fb16d53..3737e36661 100644
--- a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -615,8 +615,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/auth/integration_test/integration_test.xcodeproj/project.pbxproj b/auth/integration_test/integration_test.xcodeproj/project.pbxproj
index 24ba703147..bc90b844de 100644
--- a/auth/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/auth/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -616,8 +616,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index 835aa9de6b..500643de0f 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -20,7 +20,7 @@ endif()
 
 # If the format of the line below changes, then be sure to update
 # https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81
-set(version 13.0.1)
+set(version d16d36f158418764c37e1b776e770b85f65eff94)
 
 function(GetReleasedDep)
   message("Getting released firebase-ios-sdk @ ${version}")
diff --git a/cmake/external/firestore.patch.txt b/cmake/external/firestore.patch.txt
index 3ecb13cb94..eb0dd59a90 100644
--- a/cmake/external/firestore.patch.txt
+++ b/cmake/external/firestore.patch.txt
@@ -14,18 +14,6 @@ index 920bf2928..c5c9cc7ee 100644
  
  ExternalProject_Get_property(snappy SOURCE_DIR)
  set(snappy_source_dir "${SOURCE_DIR}")
-diff --git a/Firestore/core/src/util/ordered_code.h b/Firestore/core/src/util/ordered_code.h
---- a/Firestore/core/src/util/ordered_code.h
-+++ b/Firestore/core/src/util/ordered_code.h
-@@ -39,7 +39,8 @@
- #ifndef FIRESTORE_CORE_SRC_UTIL_ORDERED_CODE_H_
- #define FIRESTORE_CORE_SRC_UTIL_ORDERED_CODE_H_
- 
-+#include <cstdint>
- #include <string>
- 
- #include "absl/strings/string_view.h"
- 
 diff --git a/Firestore/core/src/util/quadruple.cc b/Firestore/core/src/util/quadruple.cc
 --- a/Firestore/core/src/util/quadruple.cc
 +++ b/Firestore/core/src/util/quadruple.cc
diff --git a/database/integration_test/integration_test.xcodeproj/project.pbxproj b/database/integration_test/integration_test.xcodeproj/project.pbxproj
index df50631242..c9b1f5a5e2 100644
--- a/database/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/database/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -597,8 +597,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj
index 0663126606..d8ab26a2bb 100644
--- a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -608,8 +608,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj
index 6e7258cb53..96b6c4e7a5 100644
--- a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj
+++ b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj
@@ -919,8 +919,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/functions/integration_test/integration_test.xcodeproj/project.pbxproj b/functions/integration_test/integration_test.xcodeproj/project.pbxproj
index c2b17246a0..22b36673cc 100644
--- a/functions/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/functions/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -615,8 +615,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/installations/integration_test/integration_test.xcodeproj/project.pbxproj b/installations/integration_test/integration_test.xcodeproj/project.pbxproj
index c683965296..167c46c2ca 100644
--- a/installations/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/installations/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -369,8 +369,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/ios_spm/Package.swift b/ios_spm/Package.swift
index 841937b119..418a850959 100644
--- a/ios_spm/Package.swift
+++ b/ios_spm/Package.swift
@@ -26,7 +26,7 @@ let package = Package(
         .library(name: "FirebaseDependencies", targets: ["FirebaseDependencies"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/firebase/firebase-ios-sdk.git", exact: "13.0.1"),
+        .package(url: "https://github.com/firebase/firebase-ios-sdk.git", revision: "d16d36f158418764c37e1b776e770b85f65eff94"),
         .package(url: "https://github.com/googleads/swift-package-manager-google-user-messaging-platform.git", exact: "3.1.0"),
     ],
     targets: [
diff --git a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj
index 10ea65e145..55d8b57016 100644
--- a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -604,8 +604,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj
index 3c2a19f4be..0879e4da3b 100644
--- a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -589,8 +589,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/scripts/gha/build_testapps.py b/scripts/gha/build_testapps.py
index 717be482fd..1de016ab15 100644
--- a/scripts/gha/build_testapps.py
+++ b/scripts/gha/build_testapps.py
@@ -630,6 +630,7 @@ def _build_apple(
   _run(xcode_patcher_args)
 
   xcode_path = os.path.join(project_dir, "integration_test.xcodeproj")
+  os.environ["FIREBASE_SOURCE_FIRESTORE"] = "1"
   if _APPLE_SDK_SIMULATOR in apple_sdk:
     _run(
         xcodebuild.get_args_for_build(
diff --git a/storage/integration_test/integration_test.xcodeproj/project.pbxproj b/storage/integration_test/integration_test.xcodeproj/project.pbxproj
index a74d74e65b..0a7aac8cff 100644
--- a/storage/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/storage/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -614,8 +614,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/ump/integration_test/integration_test.xcodeproj/project.pbxproj b/ump/integration_test/integration_test.xcodeproj/project.pbxproj
index 7984a0beea..e7b819a678 100644
--- a/ump/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/ump/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -376,8 +376,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
-				kind = exactVersion;
-				version = 13.0.1;
+				kind = revision;
+				revision = d16d36f158418764c37e1b776e770b85f65eff94;
 			};
 		};
 		1ABAD42B030000000002 /* XCRemoteSwiftPackageReference "swift-package-manager-google-user-messaging-platform" */ = {

From 4c08d6bf6b049d848d8531878515b0a583c5ca8a Mon Sep 17 00:00:00 2001
From: austinbenoit <austinbenoit@google.com>
Date: Thu, 22 Oct 2026 16:38:21 +0000
Subject: [PATCH 2/2] WIP

---
 .../integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 app/integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 .../integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 .../integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 cmake/external/firestore.cmake                                  | 2 +-
 .../integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 .../integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 .../integration_test.xcodeproj/project.pbxproj                  | 2 +-
 .../integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 .../integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 ios_spm/Package.swift                                           | 2 +-
 .../integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 .../integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 scripts/gha/build_testapps.py                                   | 1 -
 .../integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 ump/integration_test/integration_test.xcodeproj/project.pbxproj | 2 +-
 16 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj
index 56472a10a1..a705ef67e3 100644
--- a/analytics/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/analytics/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -588,7 +588,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/app/integration_test/integration_test.xcodeproj/project.pbxproj b/app/integration_test/integration_test.xcodeproj/project.pbxproj
index 7c7e70da27..7c950fd55b 100644
--- a/app/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/app/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -367,7 +367,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj
index 3737e36661..4210e7ab11 100644
--- a/app_check/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/app_check/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -616,7 +616,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/auth/integration_test/integration_test.xcodeproj/project.pbxproj b/auth/integration_test/integration_test.xcodeproj/project.pbxproj
index bc90b844de..3f3f78877c 100644
--- a/auth/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/auth/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -617,7 +617,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index 500643de0f..52b94b5c89 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -20,7 +20,7 @@ endif()
 
 # If the format of the line below changes, then be sure to update
 # https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81
-set(version d16d36f158418764c37e1b776e770b85f65eff94)
+set(version dc6dfd442b1f3ec215ed62b8beb2623ffab010d6)
 
 function(GetReleasedDep)
   message("Getting released firebase-ios-sdk @ ${version}")
diff --git a/database/integration_test/integration_test.xcodeproj/project.pbxproj b/database/integration_test/integration_test.xcodeproj/project.pbxproj
index c9b1f5a5e2..c50d6bdfa0 100644
--- a/database/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/database/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -598,7 +598,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj
index d8ab26a2bb..25fe3d0461 100644
--- a/firestore/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/firestore/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -609,7 +609,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj
index 96b6c4e7a5..84e3ebef49 100644
--- a/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj
+++ b/firestore/integration_test_internal/integration_test.xcodeproj/project.pbxproj
@@ -920,7 +920,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/functions/integration_test/integration_test.xcodeproj/project.pbxproj b/functions/integration_test/integration_test.xcodeproj/project.pbxproj
index 22b36673cc..4bb4d1b5ec 100644
--- a/functions/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/functions/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -616,7 +616,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/installations/integration_test/integration_test.xcodeproj/project.pbxproj b/installations/integration_test/integration_test.xcodeproj/project.pbxproj
index 167c46c2ca..65e50bdac3 100644
--- a/installations/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/installations/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -370,7 +370,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/ios_spm/Package.swift b/ios_spm/Package.swift
index 418a850959..fc3aec4f01 100644
--- a/ios_spm/Package.swift
+++ b/ios_spm/Package.swift
@@ -26,7 +26,7 @@ let package = Package(
         .library(name: "FirebaseDependencies", targets: ["FirebaseDependencies"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/firebase/firebase-ios-sdk.git", revision: "d16d36f158418764c37e1b776e770b85f65eff94"),
+        .package(url: "https://github.com/firebase/firebase-ios-sdk.git", revision: "dc6dfd442b1f3ec215ed62b8beb2623ffab010d6"),
         .package(url: "https://github.com/googleads/swift-package-manager-google-user-messaging-platform.git", exact: "3.1.0"),
     ],
     targets: [
diff --git a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj
index 55d8b57016..c35de608c9 100644
--- a/messaging/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/messaging/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -605,7 +605,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj
index 0879e4da3b..fcd1186774 100644
--- a/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/remote_config/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -590,7 +590,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/scripts/gha/build_testapps.py b/scripts/gha/build_testapps.py
index 1de016ab15..717be482fd 100644
--- a/scripts/gha/build_testapps.py
+++ b/scripts/gha/build_testapps.py
@@ -630,7 +630,6 @@ def _build_apple(
   _run(xcode_patcher_args)
 
   xcode_path = os.path.join(project_dir, "integration_test.xcodeproj")
-  os.environ["FIREBASE_SOURCE_FIRESTORE"] = "1"
   if _APPLE_SDK_SIMULATOR in apple_sdk:
     _run(
         xcodebuild.get_args_for_build(
diff --git a/storage/integration_test/integration_test.xcodeproj/project.pbxproj b/storage/integration_test/integration_test.xcodeproj/project.pbxproj
index 0a7aac8cff..7943ceae80 100644
--- a/storage/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/storage/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -615,7 +615,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/ump/integration_test/integration_test.xcodeproj/project.pbxproj b/ump/integration_test/integration_test.xcodeproj/project.pbxproj
index e7b819a678..07124c6688 100644
--- a/ump/integration_test/integration_test.xcodeproj/project.pbxproj
+++ b/ump/integration_test/integration_test.xcodeproj/project.pbxproj
@@ -377,7 +377,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = revision;
-				revision = d16d36f158418764c37e1b776e770b85f65eff94;
+				revision = dc6dfd442b1f3ec215ed62b8beb2623ffab010d6;
 			};
 		};
 		1ABAD42B030000000002 /* XCRemoteSwiftPackageReference "swift-package-manager-google-user-messaging-platform" */ = {