Merge branch 'cheryllin/fixcmake' into cheryllin/ppl

Author: cherylEnkidu

.github/workflows/firestore.yml

@@ -118,6 +118,7 @@ jobs:
 
     env:
       MINT_PATH: ${{ github.workspace }}/mint
+      USE_LATEST_CMAKE: false
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -142,6 +143,11 @@ jobs:
       with:
         python-version: '3.11'
 
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: '3.31.1'
+
     - name: Setup build
       run:  scripts/install_prereqs.sh Firestore ${{ runner.os }} cmake
 
@@ -168,6 +174,7 @@ jobs:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       MINT_PATH: ${{ github.workspace }}/mint
       TARGET_DATABASE_ID: ${{ matrix.databaseId }}
+      USE_LATEST_CMAKE: false
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -230,6 +237,11 @@ jobs:
         GOOGLE_APPLICATION_CREDENTIALS: ../google-service-account.json
       continue-on-error: true
 
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: '3.31.1'
+
     - name: Setup build
       run:  scripts/install_prereqs.sh Firestore ${{ runner.os }} cmake
 
@@ -255,6 +267,7 @@ jobs:
 
     env:
       SANITIZERS: ${{ matrix.sanitizer }}
+      USE_LATEST_CMAKE: false
 
     steps:
     - uses: actions/checkout@v4
@@ -271,6 +284,11 @@ jobs:
       with:
         python-version: '3.11'
 
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: '3.31.1'
+
     - name: Setup build
       run:  scripts/install_prereqs.sh Firestore ${{ runner.os }} cmake
 
@@ -301,6 +319,7 @@ jobs:
     env:
       SANITIZERS: ${{ matrix.sanitizer }}
       ASAN_OPTIONS: detect_leaks=0
+      USE_LATEST_CMAKE: false
 
     steps:
     - uses: actions/checkout@v3
@@ -317,6 +336,11 @@ jobs:
       with:
         python-version: '3.11'
 
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: '3.31.1'
+
     - name: Setup build
       run:  scripts/install_prereqs.sh Firestore ${{ runner.os }} cmake
 

FirebaseRemoteConfig/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Unreleased
+- [fixed] Fix an issue where network requests would fail in the iOS 18.4
+  simulator due to a URLSession bug introduced in Xcode 16.3. (#14728)
+
 # 11.10.0
 - [fixed] Fix intermittent `RCNConfigRealtime` crash due to incorrect parsing of fragmented JSON. (#14518)
 

FirebaseRemoteConfig/Sources/RCNConfigFetch.m

@@ -24,6 +24,7 @@
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigContent.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
+#import "FirebaseRemoteConfig/Sources/RCNConfigSessionConfiguration.h"
 #import "FirebaseRemoteConfig/Sources/RCNDevice.h"
 @import FirebaseRemoteConfigInterop;
 
@@ -641,7 +642,7 @@ - (NSString *)constructServerURL {
 
 - (NSURLSession *)newFetchSession {
   NSURLSessionConfiguration *config =
-      [[NSURLSessionConfiguration defaultSessionConfiguration] copy];
+      [RCNConfigSessionConfiguration remoteConfigSessionConfiguration];
   config.timeoutIntervalForRequest = _settings.fetchTimeout;
   config.timeoutIntervalForResource = _settings.fetchTimeout;
   NSURLSession *session = [NSURLSession sessionWithConfiguration:config];

FirebaseRemoteConfig/Sources/RCNConfigSessionConfiguration.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+@interface RCNConfigSessionConfiguration : NSObject
+
+/// Returns an `NSURLSessionConfiguration` instance suitable for Remote Config requests.
+///
+/// On iOS 18.4+ and visionOS 2.4+ simulators, this method returns an ephemeral session
+/// configuration as a workaround for a network request failure bug. See
+/// https://developer.apple.com/forums/thread/777999 for details. For all other environments, the
+/// default session configuration is returned.
++ (NSURLSessionConfiguration *)remoteConfigSessionConfiguration;
+
+@end

FirebaseRemoteConfig/Sources/RCNConfigSessionConfiguration.m

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import "FirebaseRemoteConfig/Sources/RCNConfigSessionConfiguration.h"
+
+@implementation RCNConfigSessionConfiguration
+
++ (NSURLSessionConfiguration *)remoteConfigSessionConfiguration {
+  // Check if the current operating system version meets the criteria of the affected simulators.
+  if (@available(iOS 18.4, tvOS 100.0, watchOS 100.0, visionOS 2.4, *)) {
+    // If the app is running on one of the affected simulator versions (or later for iOS and
+    // visionOS), use an ephemeral session configuration. Ephemeral sessions do not persist caches,
+    // cookies, or credential data to disk, which circumvents the known bug.
+    return [NSURLSessionConfiguration ephemeralSessionConfiguration];
+  }
+  return [NSURLSessionConfiguration defaultSessionConfiguration];
+}
+
+@end

scripts/install_prereqs.sh

@@ -104,7 +104,13 @@ case "$project-$platform-$method" in
     ;;
 
   Firestore-iOS-cmake | Firestore-tvOS-cmake | Firestore-macOS-cmake)
-    brew outdated cmake || brew upgrade cmake
+    # Only upgrade CMake if explicitly requested
+    if [[ "${USE_LATEST_CMAKE:-false}" == "true" ]]; then
+      echo "Use latest CMake because USE_LATEST_CMAKE=true"
+      brew outdated cmake || brew upgrade cmake
+    else
+      echo "Skipping CMake upgrade"
+    fi
     brew outdated go || brew upgrade go # Somehow the build for Abseil requires this.
     brew install ccache
     brew install ninja