Merge branch 'main' into ah/firebaseai-thoughts

Author: andrewheard

Crashlytics/CHANGELOG.md

@@ -1,4 +1,4 @@
-# Unreleased
+# 12.1.0
 - [fixed] Do not log using raw print in an internal class. (#15138)
 
 # 12.0.0

FirebaseAI/Tests/TestApp/Tests/Integration/GenerateContentIntegrationTests.swift

@@ -333,6 +333,11 @@ struct GenerateContentIntegrationTests {
       topK: 1,
       responseModalities: [.text, .image]
     )
+    let safetySettings = safetySettings.filter {
+      // HARM_CATEGORY_CIVIC_INTEGRITY is deprecated in Vertex AI but only rejected when using the
+      // 'gemini-2.0-flash-preview-image-generation' model.
+      $0.harmCategory != .civicIntegrity
+    }
     let model = FirebaseAI.componentInstance(config).generativeModel(
       modelName: ModelNames.gemini2FlashPreviewImageGeneration,
       generationConfig: generationConfig,

FirebaseAnalytics.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
     s.authors          = 'Google, Inc.'
 
     s.source           = {
-        :http => 'https://dl.google.com/firebase/ios/analytics/c3a136153af090b8/FirebaseAnalytics-12.0.0.tar.gz'
+        :http => 'https://dl.google.com/firebase/ios/analytics/f8b1e0fb38da4d8c/FirebaseAnalytics-12.1.0.tar.gz'
     }
 
     s.cocoapods_version = '>= 1.12.0'

FirebaseAuth/CHANGELOG.md

@@ -1,4 +1,4 @@
-# Unreleased
+# 12.1.0
 - [fixed] Fix a formatting issue with generated TOTP URLs that prevented them
   from working with the Google Authenticator app. (#15128)
 

FirebaseInAppMessaging/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 12.1.0
+- [fixed] Fix Xcode 26 crash from missing `NSUserActivityTypeBrowsingWeb`
+  symbol. Note that this fix isn't in the 12.1.0 zip and Carthage
+  distributions, but will be included from 12.2.0 onwards. (#15159)
+
 # 11.0.0
 - [removed] **Breaking change**: The deprecated `FirebaseInAppMessagingSwift`
   module has been removed. See

FirebaseInAppMessaging/Sources/Runtime/FIRIAMActionURLFollower.m

@@ -175,8 +175,9 @@ - (BOOL)followURLWithContinueUserActivity:(NSURL *)url {
     FIRLogDebug(kFIRLoggerInAppMessaging, @"I-IAM240004",
                 @"App delegate responds to application:continueUserActivity:restorationHandler:."
                  "Simulating action url opening from a web browser.");
-    NSUserActivity *userActivity =
-        [[NSUserActivity alloc] initWithActivityType:NSUserActivityTypeBrowsingWeb];
+    // Use string literal to ensure compatibility with Xcode 26 and iOS 18
+    NSString *browsingWebType = @"NSUserActivityTypeBrowsingWeb";
+    NSUserActivity *userActivity = [[NSUserActivity alloc] initWithActivityType:browsingWebType];
     userActivity.webpageURL = url;
     BOOL handled = [self.appDelegate application:self.mainApplication
                             continueUserActivity:userActivity

FirebaseInAppMessaging/Tests/Unit/FIRIAMActionUrlFollowerTests.m

@@ -84,8 +84,9 @@ - (void)testUniversalLinkHandlingReturnYES {
                          continueUserActivity:[OCMArg checkWithBlock:^BOOL(id userActivity) {
                            // verifying the type and url field for the userActivity object
                            NSUserActivity *activity = (NSUserActivity *)userActivity;
-                           return [activity.activityType
-                                      isEqualToString:NSUserActivityTypeBrowsingWeb] &&
+                           // Use string literal to ensure compatibility with Xcode 26 and iOS 18
+                           NSString *browsingWebType = @"NSUserActivityTypeBrowsingWeb";
+                           return [activity.activityType isEqualToString:browsingWebType] &&
                                   [activity.webpageURL isEqual:url];
                          }]
                            restorationHandler:[OCMArg any]])

FirebaseMessaging/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 12.1.0
+- [fixed] Fix Xcode 26 crash from missing `NSUserActivityTypeBrowsingWeb`
+  symbol. Note that this fix isn't in the 12.1.0 zip and Carthage
+  distributions, but will be included from 12.2.0 onwards. (#15159)
+
 # 11.14.0
 - [fixed] Fix a potential SQL injection issue. (#14846).
 

FirebaseMessaging/Sources/FIRMessaging.m

@@ -400,8 +400,9 @@ - (void)handleIncomingLinkIfNeededFromMessage:(NSDictionary *)message {
   // if they haven't implemented it.
   if ([NSUserActivity class] != nil &&
       [appDelegate respondsToSelector:continueUserActivitySelector]) {
-    NSUserActivity *userActivity =
-        [[NSUserActivity alloc] initWithActivityType:NSUserActivityTypeBrowsingWeb];
+    // Use string literal to ensure compatibility with Xcode 26 and iOS 18
+    NSString *browsingWebType = @"NSUserActivityTypeBrowsingWeb";
+    NSUserActivity *userActivity = [[NSUserActivity alloc] initWithActivityType:browsingWebType];
     userActivity.webpageURL = url;
     [appDelegate application:application
         continueUserActivity:userActivity

Firestore/CHANGELOG.md

@@ -1,4 +1,4 @@
-# Unreleased
+# 12.1.0
 - [fixed] Fixed accidental removal of `pod "Firebase/Firestore"` for tvOS in 12.0.0.
 
 # 11.12.0