Skip to content

Commit 1fa2b4f

Browse files
authored
Deprecate androidClientID and trackingID (#10520)
1 parent 8a0bb35 commit 1fa2b4f

File tree

9 files changed

+5
-42
lines changed

9 files changed

+5
-42
lines changed

FirebaseCore/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Firebase 10.4.0
2+
- Deprecate `androidClientID` and `trackingID` from FirebaseOptions. (#10520)
3+
14
# Firebase 10.2.0
25
- Update GTMSessionFetcher dependency specifications to enable support for the compatible
36
GTMSessionFetcher 3.x versions.

FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ NS_SWIFT_NAME(FirebaseOptions)
5252
/**
5353
* Unused.
5454
*/
55-
@property(nonatomic, copy, nullable) NSString *trackingID;
55+
@property(nonatomic, copy, nullable) NSString *trackingID DEPRECATED_ATTRIBUTE;
5656

5757
/**
5858
* The Project Number from the Google Developer's console, for example @"012345678901", used to
@@ -68,7 +68,7 @@ NS_SWIFT_NAME(FirebaseOptions)
6868
/**
6969
* Unused.
7070
*/
71-
@property(nonatomic, copy, nullable) NSString *androidClientID;
71+
@property(nonatomic, copy, nullable) NSString *androidClientID DEPRECATED_ATTRIBUTE;
7272

7373
/**
7474
* The Google App ID that is used to uniquely identify an instance of an app.

FirebaseCore/Tests/SwiftUnit/CoreAPITests.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,10 @@ final class CoreAPITests {
123123
// ...
124124
}
125125

126-
if let _ /* trackingID */ = options.trackingID {
127-
// ...
128-
}
129-
130126
if let _ /* projectID */ = options.projectID {
131127
// ...
132128
}
133129

134-
if let _ /* androidClientID */ = options.androidClientID {
135-
// ...
136-
}
137-
138130
if let _ /* databaseURL */ = options.databaseURL {
139131
// ...
140132
}

FirebaseCore/Tests/SwiftUnit/FirebaseAppTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ class FirebaseAppTests: XCTestCase {
300300
XCTAssertEqual(app.options.googleAppID, Constants.Options.googleAppID)
301301
XCTAssertEqual(app.options.gcmSenderID, Constants.Options.gcmSenderID)
302302
XCTAssertEqual(app.options.deepLinkURLScheme, superSecretURLScheme)
303-
XCTAssertNil(app.options.androidClientID)
304303
}
305304

306305
func testFirebaseDataCollectionDefaultEnabled() throws {

FirebaseCore/Tests/SwiftUnit/FirebaseOptionsTests.swift

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ class FirebaseOptionsTests: XCTestCase {
6969
options.bundleID = Constants.Options.bundleID
7070
options.apiKey = Constants.Options.apiKey
7171
options.clientID = Constants.Options.clientID
72-
options.trackingID = Constants.Options.trackingID
7372
options.projectID = Constants.Options.projectID
7473
options.databaseURL = Constants.Options.databaseURL
7574
options.storageBucket = Constants.Options.storageBucket
@@ -96,10 +95,6 @@ class FirebaseOptionsTests: XCTestCase {
9695
options.deepLinkURLScheme = Constants.Options.deepLinkURLScheme
9796
XCTAssertEqual(options.deepLinkURLScheme, Constants.Options.deepLinkURLScheme)
9897

99-
XCTAssertNil(options.androidClientID)
100-
options.androidClientID = Constants.Options.androidClientID
101-
XCTAssertEqual(options.androidClientID, Constants.Options.androidClientID)
102-
10398
XCTAssertNil(options.appGroupID)
10499
options.appGroupID = Constants.Options.appGroupID
105100
XCTAssertEqual(options.appGroupID, Constants.Options.appGroupID)
@@ -147,10 +142,8 @@ class FirebaseOptionsTests: XCTestCase {
147142
XCTAssertEqual(options.apiKey, Constants.Options.apiKey)
148143
XCTAssertEqual(options.bundleID, Constants.Options.bundleID)
149144
XCTAssertEqual(options.clientID, Constants.Options.clientID)
150-
XCTAssertEqual(options.trackingID, Constants.Options.trackingID)
151145
XCTAssertEqual(options.gcmSenderID, Constants.Options.gcmSenderID)
152146
XCTAssertEqual(options.projectID, Constants.Options.projectID)
153-
XCTAssertNil(options.androidClientID)
154147
XCTAssertEqual(options.googleAppID, Constants.Options.googleAppID)
155148
XCTAssertEqual(options.databaseURL, Constants.Options.databaseURL)
156149
XCTAssertNil(options.deepLinkURLScheme)
@@ -161,9 +154,7 @@ class FirebaseOptionsTests: XCTestCase {
161154
private func assertNullableOptionsAreEmpty(options: FirebaseOptions) {
162155
XCTAssertNil(options.apiKey)
163156
XCTAssertNil(options.clientID)
164-
XCTAssertNil(options.trackingID)
165157
XCTAssertNil(options.projectID)
166-
XCTAssertNil(options.androidClientID)
167158
XCTAssertNil(options.databaseURL)
168159
XCTAssertNil(options.deepLinkURLScheme)
169160
XCTAssertNil(options.storageBucket)

FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/Constants.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@ public enum Constants {
2424
static let apiKey = "correct_api_key"
2525
static let bundleID = "com.google.FirebaseSDKTests"
2626
static let clientID = "correct_client_id"
27-
static let trackingID = "correct_tracking_id"
2827
static let gcmSenderID = "correct_gcm_sender_id"
2928
static let projectID = "abc-xyz-123"
30-
static let androidClientID = "correct_android_client_id"
3129
static let googleAppID = "1:123:ios:123abc"
3230
static let databaseURL = "https://abc-xyz-123.firebaseio.com"
3331
static let deepLinkURLScheme = "comgoogledeeplinkurl"

FirebaseCore/Tests/Unit/FIROptionsTest.m

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ - (void)testInitCustomizedOptions {
148148
options.deepLinkURLScheme = kDeepLinkURLScheme;
149149
options.projectID = kProjectID;
150150
options.storageBucket = kStorageBucket;
151-
options.trackingID = kTrackingID;
152151
[self assertOptionsMatchDefaults:options andProjectID:YES];
153152
XCTAssertEqualObjects(options.deepLinkURLScheme, kDeepLinkURLScheme);
154153
XCTAssertFalse(options.usingOptionsFromDefaultPlist);
@@ -158,9 +157,7 @@ - (void)assertOptionsMatchDefaults:(FIROptions *)options andProjectID:(BOOL)matc
158157
XCTAssertEqualObjects(options.googleAppID, kGoogleAppID);
159158
XCTAssertEqualObjects(options.APIKey, kAPIKey);
160159
XCTAssertEqualObjects(options.clientID, kClientID);
161-
XCTAssertEqualObjects(options.trackingID, kTrackingID);
162160
XCTAssertEqualObjects(options.GCMSenderID, kGCMSenderID);
163-
XCTAssertNil(options.androidClientID);
164161
XCTAssertEqualObjects(options.libraryVersionID, kFIRLibraryVersionID);
165162
XCTAssertEqualObjects(options.databaseURL, kDatabaseURL);
166163
XCTAssertEqualObjects(options.storageBucket, kStorageBucket);
@@ -192,11 +189,6 @@ - (void)testCopyingProperties {
192189
[mutableString appendString:@"2"];
193190
XCTAssertEqualObjects(options.clientID, @"1");
194191

195-
mutableString = [[NSMutableString alloc] initWithString:@"1"];
196-
options.trackingID = mutableString;
197-
[mutableString appendString:@"2"];
198-
XCTAssertEqualObjects(options.trackingID, @"1");
199-
200192
mutableString = [[NSMutableString alloc] initWithString:@"1"];
201193
options.GCMSenderID = mutableString;
202194
[mutableString appendString:@"2"];
@@ -207,11 +199,6 @@ - (void)testCopyingProperties {
207199
[mutableString appendString:@"2"];
208200
XCTAssertEqualObjects(options.projectID, @"1");
209201

210-
mutableString = [[NSMutableString alloc] initWithString:@"1"];
211-
options.androidClientID = mutableString;
212-
[mutableString appendString:@"2"];
213-
XCTAssertEqualObjects(options.androidClientID, @"1");
214-
215202
mutableString = [[NSMutableString alloc] initWithString:@"1"];
216203
options.googleAppID = mutableString;
217204
[mutableString appendString:@"2"];
@@ -597,7 +584,6 @@ - (void)testModifyingOptionsThrows {
597584
options.editingLocked = YES;
598585

599586
// Modification to every property should result in an exception.
600-
XCTAssertThrows(options.androidClientID = @"should_throw");
601587
XCTAssertThrows(options.APIKey = @"should_throw");
602588
XCTAssertThrows(options.bundleID = @"should_throw");
603589
XCTAssertThrows(options.clientID = @"should_throw");
@@ -607,7 +593,6 @@ - (void)testModifyingOptionsThrows {
607593
XCTAssertThrows(options.googleAppID = @"should_throw");
608594
XCTAssertThrows(options.projectID = @"should_throw");
609595
XCTAssertThrows(options.storageBucket = @"should_throw");
610-
XCTAssertThrows(options.trackingID = @"should_throw");
611596
}
612597

613598
- (void)testVersionFormat {

SharedTestUtilities/FIROptionsMock.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
2222
extern NSString *const kAPIKey;
2323
extern NSString *const kCustomizedAPIKey;
2424
extern NSString *const kClientID;
25-
extern NSString *const kTrackingID;
2625
extern NSString *const kGCMSenderID;
27-
extern NSString *const kAndroidClientID;
2826
extern NSString *const kGoogleAppID;
2927
extern NSString *const kDatabaseURL;
3028
extern NSString *const kStorageBucket;

SharedTestUtilities/FIROptionsMock.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717
#import "FirebaseCore/Extension/FIROptionsInternal.h"
1818
#import "SharedTestUtilities/FIROptionsMock.h"
1919

20-
NSString *const kAndroidClientID = @"correct_android_client_id";
2120
NSString *const kAPIKey = @"correct_api_key";
2221
NSString *const kCustomizedAPIKey = @"customized_api_key";
2322
NSString *const kClientID = @"correct_client_id";
24-
NSString *const kTrackingID = @"correct_tracking_id";
2523
NSString *const kGCMSenderID = @"correct_gcm_sender_id";
2624
NSString *const kGoogleAppID = @"1:123:ios:123abc";
2725
NSString *const kDatabaseURL = @"https://abc-xyz-123.firebaseio.com";
@@ -50,7 +48,6 @@ + (void)mockFIROptions {
5048
kFIRGoogleAppID : kGoogleAppID,
5149
kFIRProjectID : kProjectID,
5250
kFIRStorageBucket : kStorageBucket,
53-
kFIRTrackingID : kTrackingID,
5451
};
5552
id optionsClassMock = OCMClassMock([FIROptions class]);
5653
OCMStub([optionsClassMock defaultOptionsDictionary]).andReturn(mockDictionary);

0 commit comments

Comments
 (0)