Merge branch 'main' into nc/fdl-delete

Author: ncooke3

FirebaseAI/Tests/TestApp/Sources/Constants.swift

@@ -23,8 +23,8 @@ public enum FirebaseAppNames {
 public enum ModelNames {
   public static let gemini2Flash = "gemini-2.0-flash-001"
   public static let gemini2FlashLite = "gemini-2.0-flash-lite-001"
-  public static let gemini2FlashExperimental = "gemini-2.0-flash-exp"
-  public static let gemini2_5_FlashPreview = "gemini-2.5-flash-preview-05-20"
-  public static let gemini2_5_ProPreview = "gemini-2.5-pro-preview-06-05"
+  public static let gemini2FlashPreviewImageGeneration = "gemini-2.0-flash-preview-image-generation"
+  public static let gemini2_5_Flash = "gemini-2.5-flash"
+  public static let gemini2_5_Pro = "gemini-2.5-pro"
   public static let gemma3_4B = "gemma-3-4b-it"
 }

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

@@ -135,16 +135,16 @@ struct GenerateContentIntegrationTests {
   }
 
   @Test(arguments: [
-    (InstanceConfig.vertexAI_v1beta, ModelNames.gemini2_5_FlashPreview, 0),
-    (InstanceConfig.vertexAI_v1beta, ModelNames.gemini2_5_FlashPreview, 24576),
-    (InstanceConfig.vertexAI_v1beta_global, ModelNames.gemini2_5_ProPreview, 128),
-    (InstanceConfig.vertexAI_v1beta_global, ModelNames.gemini2_5_ProPreview, 32768),
-    (InstanceConfig.googleAI_v1beta, ModelNames.gemini2_5_FlashPreview, 0),
-    (InstanceConfig.googleAI_v1beta, ModelNames.gemini2_5_FlashPreview, 24576),
-    (InstanceConfig.googleAI_v1beta, ModelNames.gemini2_5_ProPreview, 128),
-    (InstanceConfig.googleAI_v1beta, ModelNames.gemini2_5_ProPreview, 32768),
-    (InstanceConfig.googleAI_v1beta_freeTier, ModelNames.gemini2_5_FlashPreview, 0),
-    (InstanceConfig.googleAI_v1beta_freeTier, ModelNames.gemini2_5_FlashPreview, 24576),
+    (InstanceConfig.vertexAI_v1beta, ModelNames.gemini2_5_Flash, 0),
+    (InstanceConfig.vertexAI_v1beta, ModelNames.gemini2_5_Flash, 24576),
+    (InstanceConfig.vertexAI_v1beta_global, ModelNames.gemini2_5_Pro, 128),
+    (InstanceConfig.vertexAI_v1beta_global, ModelNames.gemini2_5_Pro, 32768),
+    (InstanceConfig.googleAI_v1beta, ModelNames.gemini2_5_Flash, 0),
+    (InstanceConfig.googleAI_v1beta, ModelNames.gemini2_5_Flash, 24576),
+    (InstanceConfig.googleAI_v1beta, ModelNames.gemini2_5_Pro, 128),
+    (InstanceConfig.googleAI_v1beta, ModelNames.gemini2_5_Pro, 32768),
+    (InstanceConfig.googleAI_v1beta_freeTier, ModelNames.gemini2_5_Flash, 0),
+    (InstanceConfig.googleAI_v1beta_freeTier, ModelNames.gemini2_5_Flash, 24576),
   ])
   func generateContentThinking(_ config: InstanceConfig, modelName: String,
                                thinkingBudget: Int) async throws {
@@ -197,6 +197,7 @@ struct GenerateContentIntegrationTests {
 
   @Test(arguments: [
     InstanceConfig.vertexAI_v1beta,
+    InstanceConfig.vertexAI_v1beta_global,
     InstanceConfig.googleAI_v1beta,
     InstanceConfig.googleAI_v1beta_staging,
     InstanceConfig.googleAI_v1beta_freeTier_bypassProxy,
@@ -209,7 +210,7 @@ struct GenerateContentIntegrationTests {
       responseModalities: [.text, .image]
     )
     let model = FirebaseAI.componentInstance(config).generativeModel(
-      modelName: ModelNames.gemini2FlashExperimental,
+      modelName: ModelNames.gemini2FlashPreviewImageGeneration,
       generationConfig: generationConfig,
       safetySettings: safetySettings
     )

FirebaseCore/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Unreleased
 - [removed] **Breaking change**: FirebaseDynamicLinks has been removed. See
   https://firebase.google.com/support/dynamic-links-faq for more info.
+- [removed] **Breaking change**: Removed the `Options.deepLinkURLScheme`
+  property. This API was exclusively used by the Dynamic Links SDK, which
+  has been removed.
 
 # Firebase 11.15.0
 - [fixed] Remove c99 as the required C language standard. (#14950)

FirebaseCore/Sources/FIROptions.m

@@ -160,7 +160,6 @@ - (id)copyWithZone:(NSZone *)zone {
   FIROptions *newOptions = [(FIROptions *)[[self class] allocWithZone:zone]
       initInternalWithOptionsDictionary:self.optionsDictionary];
   if (newOptions) {
-    newOptions->_deepLinkURLScheme = self->_deepLinkURLScheme;
     newOptions.appGroupID = self.appGroupID;
     newOptions.editingLocked = self.isEditingLocked;
     newOptions.usingOptionsFromDefaultPlist = self.usingOptionsFromDefaultPlist;
@@ -315,11 +314,6 @@ - (void)setStorageBucket:(NSString *)storageBucket {
   _optionsDictionary[kFIRStorageBucket] = [storageBucket copy];
 }
 
-- (void)setDeepLinkURLScheme:(NSString *)deepLinkURLScheme {
-  [self checkEditingLocked];
-  _deepLinkURLScheme = [deepLinkURLScheme copy];
-}
-
 - (NSString *)bundleID {
   return self.optionsDictionary[kFIRBundleID];
 }
@@ -357,11 +351,6 @@ - (BOOL)isEqualToOptions:(FIROptions *)options {
 
   // Validate extra properties not contained in the dictionary. Only validate it if one of the
   // objects has the property set.
-  if ((options->_deepLinkURLScheme != nil || self->_deepLinkURLScheme != nil) &&
-      ![options->_deepLinkURLScheme isEqualToString:self->_deepLinkURLScheme]) {
-    return NO;
-  }
-
   if ((options.appGroupID != nil || self.appGroupID != nil) &&
       ![options.appGroupID isEqualToString:self.appGroupID]) {
     return NO;
@@ -384,7 +373,7 @@ - (NSUInteger)hash {
   // Note: `self.analyticsOptionsDictionary` was left out here since it solely relies on the
   // contents of the main bundle's `Info.plist`. We should avoid reading that file and the contents
   // should be identical.
-  return self.optionsDictionary.hash ^ self->_deepLinkURLScheme.hash ^ self.appGroupID.hash;
+  return self.optionsDictionary.hash ^ self.appGroupID.hash;
 }
 
 #pragma mark - Internal instance methods

FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h

@@ -80,11 +80,6 @@ NS_SWIFT_NAME(FirebaseOptions)
  */
 @property(nonatomic, copy, nullable) NSString *databaseURL;
 
-/**
- * The URL scheme used to set up Durable Deep Link service.
- */
-@property(nonatomic, copy, nullable) NSString *deepLinkURLScheme DEPRECATED_ATTRIBUTE;
-
 /**
  * The Google Cloud Storage bucket name, e.g. @"abc-xyz-123.storage.firebase.com".
  */

FirebaseInAppMessaging/Tests/Integration/FunctionalTestApp/App/InAppMessaging-Example-iOS/AppDelegate.m

@@ -34,7 +34,6 @@ - (BOOL)application:(UIApplication *)application
   NSLog(@"application started");
 
   [FIRInAppMessaging disableAutoBootstrapWithFIRApp];
-  [FIROptions defaultOptions].deepLinkURLScheme = @"fiam-testing";
   [FIRApp configure];
 
   FIRIAMSDKSettings *sdkSetting = [[FIRIAMSDKSettings alloc] init];

SharedTestUtilities/FIROptionsMock.h

@@ -27,9 +27,6 @@ extern NSString *const kGoogleAppID;
 extern NSString *const kDatabaseURL;
 extern NSString *const kStorageBucket;
 
-extern NSString *const kDeepLinkURLScheme;
-extern NSString *const kNewDeepLinkURLScheme;
-
 extern NSString *const kBundleID;
 extern NSString *const kProjectID;
 

SharedTestUtilities/FIROptionsMock.m

@@ -25,9 +25,6 @@
 NSString *const kDatabaseURL = @"https://abc-xyz-123.firebaseio.com";
 NSString *const kStorageBucket = @"project-id-123.storage.firebase.com";
 
-NSString *const kDeepLinkURLScheme = @"comgoogledeeplinkurl";
-NSString *const kNewDeepLinkURLScheme = @"newdeeplinkurlfortest";
-
 NSString *const kBundleID = @"com.google.FirebaseSDKTests";
 NSString *const kProjectID = @"abc-xyz-123";
 

docs/FirebaseOptionsPerProduct.md

@@ -11,7 +11,6 @@ Summarize which Firebase Options fields (and GoogleService-Info.plist attributes
 | **projectID**         |       |   ✅  |       |       |       |       |   ✅ |       |  ✅  |  ✅   |        |  ✅   |       |  ✅  |   ✅  |  ✅   |       |
 | **googleAppID**       |   ✅  |  ✅   |       |  ✅  |       |  ✅   |   ✅ |       |       |       |   ✅   |   ✅  | ✅   |       |  ✅   |   ✅ |   ✅ |
 | **databaseURL**       |       |       |       |       |       |       |   ✅  |       |       |       |       |       |       |       |       |       |       |
-| **deepLinkURLScheme** |       |       |       |       |       |       |       |    ✅ |       |       |       |       |       |       |       |       |       |
 | **storageBucket**     |       |       |       |       |       |       |       |       |       |       |       |       |       |       |       |       |   ✅   |
 
 
@@ -26,7 +25,6 @@ to GoogleService-Info.plist attributes.
 * *projectID*: The Project ID from the Firebase console
 * *googleAppID*: The Google App ID that is used to uniquely identify an instance of an app
 * *databaseURL*: The realtime database root URL
-* *deepLinkURLScheme*: The URL scheme used to set up Durable Deep Link service
 * *storageBucket*: The Google Cloud Storage bucket name
 
 ## Questions
@@ -36,10 +34,8 @@ to GoogleService-Info.plist attributes.
 * *gcmSenderID* is the second subfield of *googleAppID*. Can it be eliminated?
 * *bundleID* seems to have three purposes: Performance SDK uses it. Messaging back end uses it. Core
   will generate an error message if it doesn't match the actual bundleID. Anything else?
-* Why isn't *deepLinkURLScheme* set from the GoogleService-Info.plist field `REVERSED_CLIENT_ID` like
-  other Firebase Options? The client code is required to explicitly set it.
 * Is there a better way to manage the fields that are only used by one product? *clientID*, *databaseURL*,
-  *deepLinkURLScheme*, and *storageBucket*.
+  and *storageBucket*.
 
 ## Unused FirebaseOptions
 Proposal: Deprecate these in the SDK and stop generating them for GoogleService-Info.plist.