From aed55483d188a37736227cd8a3a37546a6c9e928 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Fri, 20 Jun 2025 15:51:48 +0000 Subject: [PATCH 1/4] Correct CHANGELOG for FIROptions property removal --- FirebaseCore/CHANGELOG.md | 1 + FirebaseCore/Sources/FIROptions.m | 20 ------------------- .../Sources/Public/FirebaseCore/FIROptions.h | 10 ---------- docs/FirebaseOptionsPerProduct.md | 5 +---- 4 files changed, 2 insertions(+), 34 deletions(-) diff --git a/FirebaseCore/CHANGELOG.md b/FirebaseCore/CHANGELOG.md index 96eebc5e656..cc0fdff9d87 100644 --- a/FirebaseCore/CHANGELOG.md +++ b/FirebaseCore/CHANGELOG.md @@ -2,6 +2,7 @@ - [removed] **Breaking change**: Removed the `Options.deepLinkURLScheme` property. This API was exclusively used by the Dynamic Links SDK, which has been removed. +- Removed `androidClientID` and `trackingID` from FirebaseOptions. # Firebase 11.15.0 - [fixed] Remove c99 as the required C language standard. (#14950) diff --git a/FirebaseCore/Sources/FIROptions.m b/FirebaseCore/Sources/FIROptions.m index c3b10b06bdb..1f82a09bc99 100644 --- a/FirebaseCore/Sources/FIROptions.m +++ b/FirebaseCore/Sources/FIROptions.m @@ -20,11 +20,9 @@ // Keys for the strings in the plist file. NSString *const kFIRAPIKey = @"API_KEY"; -NSString *const kFIRTrackingID = @"TRACKING_ID"; NSString *const kFIRGoogleAppID = @"GOOGLE_APP_ID"; NSString *const kFIRClientID = @"CLIENT_ID"; NSString *const kFIRGCMSenderID = @"GCM_SENDER_ID"; -NSString *const kFIRAndroidClientID = @"ANDROID_CLIENT_ID"; NSString *const kFIRDatabaseURL = @"DATABASE_URL"; NSString *const kFIRStorageBucket = @"STORAGE_BUCKET"; // The key to locate the expected bundle identifier in the plist file. @@ -232,15 +230,6 @@ - (void)setClientID:(NSString *)clientID { _optionsDictionary[kFIRClientID] = [clientID copy]; } -- (NSString *)trackingID { - return self.optionsDictionary[kFIRTrackingID]; -} - -- (void)setTrackingID:(NSString *)trackingID { - [self checkEditingLocked]; - _optionsDictionary[kFIRTrackingID] = [trackingID copy]; -} - - (NSString *)GCMSenderID { return self.optionsDictionary[kFIRGCMSenderID]; } @@ -259,15 +248,6 @@ - (void)setProjectID:(NSString *)projectID { _optionsDictionary[kFIRProjectID] = [projectID copy]; } -- (NSString *)androidClientID { - return self.optionsDictionary[kFIRAndroidClientID]; -} - -- (void)setAndroidClientID:(NSString *)androidClientID { - [self checkEditingLocked]; - _optionsDictionary[kFIRAndroidClientID] = [androidClientID copy]; -} - - (NSString *)googleAppID { return self.optionsDictionary[kFIRGoogleAppID]; } diff --git a/FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h b/FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h index 4272b8433e2..4e9f8853097 100644 --- a/FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h +++ b/FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h @@ -49,11 +49,6 @@ NS_SWIFT_NAME(FirebaseOptions) */ @property(nonatomic, copy, nullable) NSString *clientID; -/** - * Unused. - */ -@property(nonatomic, copy, nullable) NSString *trackingID DEPRECATED_ATTRIBUTE; - /** * The Project Number from the Google Developer's console, for example @"012345678901", used to * configure Firebase Cloud Messaging. @@ -65,11 +60,6 @@ NS_SWIFT_NAME(FirebaseOptions) */ @property(nonatomic, copy, nullable) NSString *projectID; -/** - * Unused. - */ -@property(nonatomic, copy, nullable) NSString *androidClientID DEPRECATED_ATTRIBUTE; - /** * The Google App ID that is used to uniquely identify an instance of an app. */ diff --git a/docs/FirebaseOptionsPerProduct.md b/docs/FirebaseOptionsPerProduct.md index 434258e167c..9e3263f7db2 100644 --- a/docs/FirebaseOptionsPerProduct.md +++ b/docs/FirebaseOptionsPerProduct.md @@ -38,10 +38,7 @@ to GoogleService-Info.plist attributes. and *storageBucket*. ## Unused FirebaseOptions -Proposal: Deprecate these in the SDK and stop generating them for GoogleService-Info.plist. - -* *androidClientID* -* *trackingID* +Proposal: Remove these from the SDK and stop generating them for GoogleService-Info.plist. ## Unread GoogleService-Info.plist fields Proposal: Stop generating these for GoogleService-Info.plist. From 5f50aab906726ebc06df82dbf6d96f871dcaebae Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Fri, 20 Jun 2025 11:57:06 -0400 Subject: [PATCH 2/4] Update CHANGELOG.md --- FirebaseCore/CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/FirebaseCore/CHANGELOG.md b/FirebaseCore/CHANGELOG.md index cc0fdff9d87..2cf186ddd7c 100644 --- a/FirebaseCore/CHANGELOG.md +++ b/FirebaseCore/CHANGELOG.md @@ -2,7 +2,10 @@ - [removed] **Breaking change**: Removed the `Options.deepLinkURLScheme` property. This API was exclusively used by the Dynamic Links SDK, which has been removed. -- Removed `androidClientID` and `trackingID` from FirebaseOptions. +- [removed] **Breaking change**: Removed the `Options.androidClientID` + property. This API was unused. +- [removed] **Breaking change**: Removed the `Options.trackingID` + property. This API was unused. # Firebase 11.15.0 - [fixed] Remove c99 as the required C language standard. (#14950) From 043f1f61154b45446d463fd31311f13d5e17a707 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Fri, 20 Jun 2025 12:00:16 -0400 Subject: [PATCH 3/4] Update FirebaseOptionsPerProduct.md --- docs/FirebaseOptionsPerProduct.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/FirebaseOptionsPerProduct.md b/docs/FirebaseOptionsPerProduct.md index 9e3263f7db2..bd85332cd85 100644 --- a/docs/FirebaseOptionsPerProduct.md +++ b/docs/FirebaseOptionsPerProduct.md @@ -37,9 +37,6 @@ to GoogleService-Info.plist attributes. * Is there a better way to manage the fields that are only used by one product? *clientID*, *databaseURL*, and *storageBucket*. -## Unused FirebaseOptions -Proposal: Remove these from the SDK and stop generating them for GoogleService-Info.plist. - ## Unread GoogleService-Info.plist fields Proposal: Stop generating these for GoogleService-Info.plist. From 4eedeadd4d4a189e7f32a79ee582648af83ff5f8 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Fri, 20 Jun 2025 12:01:00 -0400 Subject: [PATCH 4/4] Update CHANGELOG.md --- FirebaseCore/CHANGELOG.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/FirebaseCore/CHANGELOG.md b/FirebaseCore/CHANGELOG.md index 2cf186ddd7c..139aec8eea9 100644 --- a/FirebaseCore/CHANGELOG.md +++ b/FirebaseCore/CHANGELOG.md @@ -2,10 +2,9 @@ - [removed] **Breaking change**: Removed the `Options.deepLinkURLScheme` property. This API was exclusively used by the Dynamic Links SDK, which has been removed. -- [removed] **Breaking change**: Removed the `Options.androidClientID` - property. This API was unused. -- [removed] **Breaking change**: Removed the `Options.trackingID` - property. This API was unused. +- [removed] **Breaking change**: Removed the following unused API. + - `Options.androidClientID` + - `Options.trackingID` # Firebase 11.15.0 - [fixed] Remove c99 as the required C language standard. (#14950)