Skip to content

Commit 7ac5bcb

Browse files
[Core] Remove Options.androidClientID and Options.trackingID (#15013)
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
1 parent 9f311f2 commit 7ac5bcb

File tree

4 files changed

+3
-36
lines changed

4 files changed

+3
-36
lines changed

FirebaseCore/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
- [removed] **Breaking change**: Removed the `Options.deepLinkURLScheme`
55
property. This API was exclusively used by the Dynamic Links SDK, which
66
has been removed.
7+
- [removed] **Breaking change**: Removed the following unused API.
8+
- `Options.androidClientID`
9+
- `Options.trackingID`
710

811
# Firebase 11.15.0
912
- [fixed] Remove c99 as the required C language standard. (#14950)

FirebaseCore/Sources/FIROptions.m

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020

2121
// Keys for the strings in the plist file.
2222
NSString *const kFIRAPIKey = @"API_KEY";
23-
NSString *const kFIRTrackingID = @"TRACKING_ID";
2423
NSString *const kFIRGoogleAppID = @"GOOGLE_APP_ID";
2524
NSString *const kFIRClientID = @"CLIENT_ID";
2625
NSString *const kFIRGCMSenderID = @"GCM_SENDER_ID";
27-
NSString *const kFIRAndroidClientID = @"ANDROID_CLIENT_ID";
2826
NSString *const kFIRDatabaseURL = @"DATABASE_URL";
2927
NSString *const kFIRStorageBucket = @"STORAGE_BUCKET";
3028
// The key to locate the expected bundle identifier in the plist file.
@@ -232,15 +230,6 @@ - (void)setClientID:(NSString *)clientID {
232230
_optionsDictionary[kFIRClientID] = [clientID copy];
233231
}
234232

235-
- (NSString *)trackingID {
236-
return self.optionsDictionary[kFIRTrackingID];
237-
}
238-
239-
- (void)setTrackingID:(NSString *)trackingID {
240-
[self checkEditingLocked];
241-
_optionsDictionary[kFIRTrackingID] = [trackingID copy];
242-
}
243-
244233
- (NSString *)GCMSenderID {
245234
return self.optionsDictionary[kFIRGCMSenderID];
246235
}
@@ -259,15 +248,6 @@ - (void)setProjectID:(NSString *)projectID {
259248
_optionsDictionary[kFIRProjectID] = [projectID copy];
260249
}
261250

262-
- (NSString *)androidClientID {
263-
return self.optionsDictionary[kFIRAndroidClientID];
264-
}
265-
266-
- (void)setAndroidClientID:(NSString *)androidClientID {
267-
[self checkEditingLocked];
268-
_optionsDictionary[kFIRAndroidClientID] = [androidClientID copy];
269-
}
270-
271251
- (NSString *)googleAppID {
272252
return self.optionsDictionary[kFIRGoogleAppID];
273253
}

FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ NS_SWIFT_NAME(FirebaseOptions)
4949
*/
5050
@property(nonatomic, copy, nullable) NSString *clientID;
5151

52-
/**
53-
* Unused.
54-
*/
55-
@property(nonatomic, copy, nullable) NSString *trackingID DEPRECATED_ATTRIBUTE;
56-
5752
/**
5853
* The Project Number from the Google Developer's console, for example @"012345678901", used to
5954
* configure Firebase Cloud Messaging.
@@ -65,11 +60,6 @@ NS_SWIFT_NAME(FirebaseOptions)
6560
*/
6661
@property(nonatomic, copy, nullable) NSString *projectID;
6762

68-
/**
69-
* Unused.
70-
*/
71-
@property(nonatomic, copy, nullable) NSString *androidClientID DEPRECATED_ATTRIBUTE;
72-
7363
/**
7464
* The Google App ID that is used to uniquely identify an instance of an app.
7565
*/

docs/FirebaseOptionsPerProduct.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ to GoogleService-Info.plist attributes.
3737
* Is there a better way to manage the fields that are only used by one product? *clientID*, *databaseURL*,
3838
and *storageBucket*.
3939

40-
## Unused FirebaseOptions
41-
Proposal: Deprecate these in the SDK and stop generating them for GoogleService-Info.plist.
42-
43-
* *androidClientID*
44-
* *trackingID*
45-
4640
## Unread GoogleService-Info.plist fields
4741
Proposal: Stop generating these for GoogleService-Info.plist.
4842

0 commit comments

Comments
 (0)