Merge branch 'main' into ah/ai-generable

Author: andrewheard

.github/workflows/zip.yml

@@ -9,6 +9,8 @@
 #    zip from the current commit (HEAD).
 name: zip
 
+# TODO(ncooke3): Also do Xcode 26 testing
+
 permissions:
   actions: read
   contents: read
@@ -357,14 +359,13 @@ jobs:
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       SDK: "FirebaseAI"
-      # This is a workaround to use the FirebaseAIExampleZip scheme that does not have the SPM dependency.
-      SWIFT_SUFFIX: "Zip"
+      SWIFT_SUFFIX: " (iOS)"
     strategy:
       matrix:
         artifact: [Firebase-actions-dir, Firebase-actions-dir-dynamic]
         build-env:
           - os: macos-15
-            xcode: Xcode_16.4
+            xcode: Xcode_26.1
     runs-on: ${{ matrix.build-env.os }}
     steps:
     - uses: actions/checkout@v4
@@ -385,7 +386,7 @@ jobs:
         find "${GITHUB_WORKSPACE}" -name "Firebase*latest.zip" -exec unzip -d "${HOME}"/ios_frameworks/ {} +
     - uses: actions/checkout@v4
     - name: Setup quickstart
-      run: SAMPLE="$SDK" TARGET="${SDK}ExampleZip" scripts/setup_quickstart_framework.sh \
+      run: SAMPLE="$SDK" TARGET="${SDK}Example" scripts/setup_quickstart_framework.sh \
                                                "${HOME}"/ios_frameworks/Firebase/FirebaseAILogic/* \
                                                "${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/*
     - name: Install Secret GoogleService-Info.plist

Crashlytics/Crashlytics/Helpers/FIRCLSFile.m

@@ -175,9 +175,13 @@ bool FIRCLSFileCloseWithOffset(FIRCLSFile* file, off_t* finalSize) {
     *finalSize = file->writtenLength;
   }
 
-  if (close(file->fd) != 0) {
-    FIRCLSSDKLog("Error: Unable to close file %s\n", strerror(errno));
-    return false;
+  // If the FIRCLSFile struct was zero-initialized (e.g. via memset) and never opened,
+  // fd will be 0. Closing fd 0 triggers a system-level EXC_GUARD crash.
+  if (file->fd > STDERR_FILENO) {
+    if (close(file->fd) != 0) {
+      FIRCLSSDKLog("Error: Unable to close file %s\n", strerror(errno));
+      return false;
+    }
   }
 
   memset(file, 0, sizeof(FIRCLSFile));

FirebaseAuth/CHANGELOG.md

@@ -1,5 +1,6 @@
-# Unreleased
+# 12.7.0
 - [fixed] Add a mechanism to prevent concurrent token refreshes. (#15474)
+- [fixed] Fix "weak never mutated" build warning introduced in Xcode 26.2.
 
 # 12.2.0
 - [added] Added TOTP support for macOS.

FirebaseAuth/Sources/Swift/Auth/Auth.swift

@@ -1938,30 +1938,30 @@ extension Auth: AuthInterop {
         "for the new token.")
     }
     autoRefreshScheduled = true
-    weak var weakSelf = self
-    authDispatcher.dispatch(afterDelay: delay, queue: kAuthGlobalWorkQueue) {
-      guard let strongSelf = weakSelf else {
+    authDispatcher.dispatch(afterDelay: delay, queue: kAuthGlobalWorkQueue) { [weak self] in
+      guard let self else {
         return
       }
-      guard strongSelf._currentUser?.rawAccessToken() == accessToken else {
+      guard self._currentUser?.rawAccessToken() == accessToken else {
         // Another auto refresh must have been scheduled, so keep _autoRefreshScheduled unchanged.
         return
       }
-      strongSelf.autoRefreshScheduled = false
-      if strongSelf.isAppInBackground {
+      self.autoRefreshScheduled = false
+      if self.isAppInBackground {
         return
       }
-      let uid = strongSelf._currentUser?.uid
-      strongSelf._currentUser?
-        .internalGetToken(forceRefresh: true, backend: strongSelf.backend) { token, error in
-          if strongSelf._currentUser?.uid != uid {
+      let uid = self._currentUser?.uid
+      self._currentUser?
+        .internalGetToken(forceRefresh: true, backend: self.backend) { [weak self] token, error in
+          guard let self else { return }
+          if self._currentUser?.uid != uid {
             return
           }
           if error != nil {
             // Kicks off exponential back off logic to retry failed attempt. Starts with one minute
             // delay (60 seconds) if this is the first failed attempt.
             let rescheduleDelay = retry ? min(delay * 2, 16 * 60) : 60
-            strongSelf.scheduleAutoTokenRefresh(withDelay: rescheduleDelay, retry: true)
+            self.scheduleAutoTokenRefresh(withDelay: rescheduleDelay, retry: true)
           }
         }
     }

FirebaseCore/CHANGELOG.md

@@ -1,4 +1,4 @@
-# Unreleased
+# Firebase 12.7.0
 - [fixed] [CocoaPods] Enable module map generation for Firebase pods. This
   resolves build failures when using static linking
   (`use_frameworks! :linkage => :static`) in projects using frameworks like

FirebaseDatabase/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 12.7.0
+- [fixed] Fix `Fatal Exception: FirebaseDatabasePersistenceFailure`. (#4493)
+- [fixed] Concurrency crash in FView. (#15514)
+
 # 11.9.0
 - [fixed] Fix connection failure issue introduced in 10.27.0 by restoring the
   Socket Rocket implementation instead of `NSURLSessionWebSocket`. Note that

FirebaseDatabase/Sources/Core/View/FView.m

@@ -70,6 +70,8 @@ @interface FView ()
 @property(nonatomic, strong, readwrite) FQuerySpec *query;
 @property(nonatomic, strong) FViewProcessor *processor;
 @property(nonatomic, strong) FViewCache *viewCache;
+
+// All accesses must be guarded by @synchronized(self.eventRegistrations)
 @property(nonatomic, strong) NSMutableArray *eventRegistrations;
 @property(nonatomic, strong) FEventGenerator *eventGenerator;
 
@@ -165,11 +167,15 @@ - (id)initWithQuery:(FQuerySpec *)query
 }
 
 - (BOOL)isEmpty {
-    return self.eventRegistrations.count == 0;
+    @synchronized(self.eventRegistrations) {
+        return self.eventRegistrations.count == 0;
+    }
 }
 
 - (void)addEventRegistration:(id<FEventRegistration>)eventRegistration {
-    [self.eventRegistrations addObject:eventRegistration];
+    @synchronized(self.eventRegistrations) {
+        [self.eventRegistrations addObject:eventRegistration];
+    }
 }
 
 /**
@@ -181,31 +187,33 @@ - (void)addEventRegistration:(id<FEventRegistration>)eventRegistration {
 - (NSArray *)removeEventRegistration:(id<FEventRegistration>)eventRegistration
                          cancelError:(NSError *)cancelError {
     NSMutableArray *cancelEvents = [[NSMutableArray alloc] init];
-    if (cancelError != nil) {
-        NSAssert(eventRegistration == nil,
-                 @"A cancel should cancel all event registrations.");
-        FPath *path = self.query.path;
-        for (id<FEventRegistration> registration in self.eventRegistrations) {
-            FCancelEvent *maybeEvent =
-                [registration createCancelEventFromError:cancelError path:path];
-            if (maybeEvent) {
-                [cancelEvents addObject:maybeEvent];
+    @synchronized(self.eventRegistrations) {
+        if (cancelError != nil) {
+            NSAssert(eventRegistration == nil,
+                     @"A cancel should cancel all event registrations.");
+            FPath *path = self.query.path;
+            for (id<FEventRegistration> registration in self
+                     .eventRegistrations) {
+                FCancelEvent *maybeEvent =
+                    [registration createCancelEventFromError:cancelError
+                                                        path:path];
+                if (maybeEvent) {
+                    [cancelEvents addObject:maybeEvent];
+                }
             }
         }
-    }
 
-    if (eventRegistration) {
-        NSUInteger i = 0;
-        while (i < self.eventRegistrations.count) {
-            id<FEventRegistration> existing = self.eventRegistrations[i];
-            if ([existing matches:eventRegistration]) {
-                [self.eventRegistrations removeObjectAtIndex:i];
-            } else {
-                i++;
-            }
+        if (eventRegistration) {
+            NSIndexSet *indexesToRemove =
+                [self.eventRegistrations indexesOfObjectsPassingTest:^BOOL(
+                                             id<FEventRegistration> existing,
+                                             NSUInteger idx, BOOL *stop) {
+                  return [existing matches:eventRegistration];
+                }];
+            [self.eventRegistrations removeObjectsAtIndexes:indexesToRemove];
+        } else {
+            [self.eventRegistrations removeAllObjects];
         }
-    } else {
-        [self.eventRegistrations removeAllObjects];
     }
     return cancelEvents;
 }
@@ -270,7 +278,10 @@ - (NSArray *)generateEventsForChanges:(NSArray *)changes
                          registration:(id<FEventRegistration>)registration {
     NSArray *registrations;
     if (registration == nil) {
-        registrations = [[NSArray alloc] initWithArray:self.eventRegistrations];
+        @synchronized(self.eventRegistrations) {
+            registrations =
+                [[NSArray alloc] initWithArray:self.eventRegistrations];
+        }
     } else {
         registrations = [[NSArray alloc] initWithObjects:registration, nil];
     }

FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.m

@@ -977,17 +977,40 @@ - (id)deserializePrimitive:(NSData *)data {
 }
 
 + (void)ensureDir:(NSString *)path markAsDoNotBackup:(BOOL)markAsDoNotBackup {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
     NSError *error;
-    BOOL success =
-        [[NSFileManager defaultManager] createDirectoryAtPath:path
-                                  withIntermediateDirectories:YES
-                                                   attributes:nil
-                                                        error:&error];
+
+    // Create the directory if it doesn't exist. This call is a no-op if it
+    // already exists.
+    BOOL success = [fileManager createDirectoryAtPath:path
+                          withIntermediateDirectories:YES
+                                           attributes:nil
+                                                error:&error];
     if (!success) {
         @throw [NSException
             exceptionWithName:@"FailedToCreatePersistenceDir"
                        reason:@"Failed to create persistence directory."
-                     userInfo:@{@"path" : path}];
+                     userInfo:@{
+                         @"path" : path,
+                         @"error" : error ?: [NSNull null]
+                     }];
+    }
+
+    // Now, ensure the file protection attribute is set. This will apply it
+    // whether the directory was just created or already existed. Note, this
+    // attribute has no effect on simulators.
+    NSDictionary *attributes = @{
+        NSFileProtectionKey :
+            NSFileProtectionCompleteUntilFirstUserAuthentication
+    };
+    success = [fileManager setAttributes:attributes
+                            ofItemAtPath:path
+                                   error:&error];
+    if (!success) {
+        FFWarn(@"I-RDB076036",
+               @"Failed to set file protection attribute on persistence "
+               @"directory: %@",
+               error);
     }
 
     if (markAsDoNotBackup) {
@@ -1000,9 +1023,6 @@ + (void)ensureDir:(NSString *)path markAsDoNotBackup:(BOOL)markAsDoNotBackup {
                 @"I-RDB076035",
                 @"Failed to mark firebase database folder as do not backup: %@",
                 error);
-            [NSException raise:@"Error marking as do not backup"
-                        format:@"Failed to mark folder %@ as do not backup",
-                               firebaseDirURL];
         }
     }
 }

FirebaseDatabase/Tests/Integration/FIRDatabaseQueryTests.m

@@ -3563,7 +3563,6 @@ - (void)testListenForChildAddedWithLimitEnsureEventsFireProperly {
   WAIT_FOR(count == 3);
 }
 
-#ifdef FLAKY_TEST
 - (void)testListenForChildChangedWithLimitEnsureEventsFireProperly {
   FTupleFirebase* refs = [FTestHelpers getRandomNodePair];
   FIRDatabaseReference* writer = refs.one;
@@ -3603,7 +3602,6 @@ - (void)testListenForChildChangedWithLimitEnsureEventsFireProperly {
 
   WAIT_FOR(count == 3);
 }
-#endif
 
 - (void)testListenForChildRemovedWithLimitEnsureEventsFireProperly {
   FTupleFirebase* refs = [FTestHelpers getRandomNodePair];

FirebaseDatabase/Tests/Unit/FLevelDBStorageEngineTests.m

@@ -25,8 +25,11 @@
 #import "FirebaseDatabase/Sources/Snapshot/FSnapshotUtilities.h"
 #import "FirebaseDatabase/Tests/Helpers/FTestHelpers.h"
 
-@interface FLevelDBStorageEngineTests : XCTestCase
+@interface FLevelDBStorageEngine (Tests)
++ (void)ensureDir:(NSString *)path markAsDoNotBackup:(BOOL)markAsDoNotBackup;
+@end
 
+@interface FLevelDBStorageEngineTests : XCTestCase
 @end
 
 @implementation FLevelDBStorageEngineTests
@@ -685,4 +688,49 @@ - (void)testRemoveTrackedQueryRemovesTrackedQueryKeys {
                         ([NSSet setWithArray:@[ @"b", @"c" ]]));
 }
 
+- (void)testEnsureDirSetsCorrectFileProtection {
+  NSString *testDirName =
+      [NSString stringWithFormat:@"fdb_persistence_test_%lu", (unsigned long)arc4random()];
+  NSString *testPath = [NSTemporaryDirectory() stringByAppendingPathComponent:testDirName];
+  NSFileManager *fileManager = [NSFileManager defaultManager];
+
+  // --- Test creation ---
+  [fileManager removeItemAtPath:testPath error:nil];
+  [FLevelDBStorageEngine ensureDir:testPath markAsDoNotBackup:NO];
+
+  NSError *error = nil;
+  NSDictionary<NSFileAttributeKey, id> *attributes = [fileManager attributesOfItemAtPath:testPath
+                                                                                   error:&error];
+  XCTAssertNil(error, @"Failed to get attributes of directory: %@", error);
+
+#if !TARGET_OS_SIMULATOR
+  // On a physical device, file protection should be set.
+  XCTAssertEqualObjects(attributes[NSFileProtectionKey],
+                        NSFileProtectionCompleteUntilFirstUserAuthentication);
+#else
+  XCTAssertNil(attributes[NSFileProtectionKey]);
+#endif
+
+  // --- Test update on existing directory ---
+#if !TARGET_OS_SIMULATOR
+  // This part of the test is only relevant on devices where file protection is supported.
+  [fileManager removeItemAtPath:testPath error:nil];
+  NSDictionary *initialAttributes = @{NSFileProtectionKey : NSFileProtectionNone};
+  XCTAssertTrue([fileManager createDirectoryAtPath:testPath
+                       withIntermediateDirectories:YES
+                                        attributes:initialAttributes
+                                             error:&error],
+                @"Failed to create directory for update test: %@", error);
+
+  [FLevelDBStorageEngine ensureDir:testPath markAsDoNotBackup:NO];
+
+  attributes = [fileManager attributesOfItemAtPath:testPath error:&error];
+  XCTAssertNil(error, @"Failed to get attributes after update: %@", error);
+  XCTAssertEqualObjects(attributes[NSFileProtectionKey],
+                        NSFileProtectionCompleteUntilFirstUserAuthentication);
+#endif  // !TARGET_OS_SIMULATOR
+
+  // Clean up
+  [fileManager removeItemAtPath:testPath error:nil];
+}
 @end