aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar davidair <davidair@users.noreply.github.com>2018-01-08 10:41:25 -0500
committerGravatar GitHub <noreply@github.com>2018-01-08 10:41:25 -0500
commita84704f65b4134f45ca6e2dad2e885ff36731207 (patch)
treee8bdaa285ba1c766681e10f785a927dac2c9e48f
parent9d15d0dee7d403f989bd0360e17b8862ea32d3ec (diff)
Removing an obsolete setting from plist files (#617)
* Removing an obsolete setting from plist files * Fixing Unit Tests * Fixing nullability
-rw-r--r--Example/Auth/App/GoogleService-Info.plist2
-rw-r--r--Example/Core/App/GoogleService-Info.plist2
-rw-r--r--Example/Core/Tests/FIROptionsTest.m7
-rw-r--r--Example/Core/Tests/FIRTestCase.m1
-rw-r--r--Example/Database/App/GoogleService-Info.plist2
-rw-r--r--Example/Messaging/App/GoogleService-Info.plist2
-rw-r--r--Example/Storage/App/GoogleService-Info.plist2
-rw-r--r--Example/Storage/Tests/Unit/FIRStorageTests.m2
8 files changed, 4 insertions, 16 deletions
diff --git a/Example/Auth/App/GoogleService-Info.plist b/Example/Auth/App/GoogleService-Info.plist
index 89afffe..3f7547f 100644
--- a/Example/Auth/App/GoogleService-Info.plist
+++ b/Example/Auth/App/GoogleService-Info.plist
@@ -10,8 +10,6 @@
<string>correct_client_id</string>
<key>REVERSED_CLIENT_ID</key>
<string>correct_reversed_client_id</string>
- <key>ANDROID_CLIENT_ID</key>
- <string>correct_android_client_id</string>
<key>GOOGLE_APP_ID</key>
<string>1:123:ios:123abc</string>
<key>GCM_SENDER_ID</key>
diff --git a/Example/Core/App/GoogleService-Info.plist b/Example/Core/App/GoogleService-Info.plist
index 89afffe..3f7547f 100644
--- a/Example/Core/App/GoogleService-Info.plist
+++ b/Example/Core/App/GoogleService-Info.plist
@@ -10,8 +10,6 @@
<string>correct_client_id</string>
<key>REVERSED_CLIENT_ID</key>
<string>correct_reversed_client_id</string>
- <key>ANDROID_CLIENT_ID</key>
- <string>correct_android_client_id</string>
<key>GOOGLE_APP_ID</key>
<string>1:123:ios:123abc</string>
<key>GCM_SENDER_ID</key>
diff --git a/Example/Core/Tests/FIROptionsTest.m b/Example/Core/Tests/FIROptionsTest.m
index 2ebad15..d27a0e1 100644
--- a/Example/Core/Tests/FIROptionsTest.m
+++ b/Example/Core/Tests/FIROptionsTest.m
@@ -87,7 +87,7 @@ extern NSString *const kFIRLibraryVersionID;
APIKey:kAPIKey
clientID:kClientID
trackingID:kTrackingID
- androidClientID:kAndroidClientID
+ androidClientID:(id _Nonnull)nil
databaseURL:kDatabaseURL
storageBucket:kStorageBucket
deepLinkURLScheme:kDeepLinkURLScheme];
@@ -98,7 +98,6 @@ extern NSString *const kFIRLibraryVersionID;
FIROptions *options2 =
[[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID];
- options2.androidClientID = kAndroidClientID;
options2.APIKey = kAPIKey;
options2.bundleID = kBundleID;
options2.clientID = kClientID;
@@ -152,7 +151,7 @@ extern NSString *const kFIRLibraryVersionID;
XCTAssertEqualObjects(options.clientID, kClientID);
XCTAssertEqualObjects(options.trackingID, kTrackingID);
XCTAssertEqualObjects(options.GCMSenderID, kGCMSenderID);
- XCTAssertEqualObjects(options.androidClientID, kAndroidClientID);
+ XCTAssertNil(options.androidClientID);
XCTAssertEqualObjects(options.libraryVersionID, kFIRLibraryVersionID);
XCTAssertEqualObjects(options.databaseURL, kDatabaseURL);
XCTAssertEqualObjects(options.storageBucket, kStorageBucket);
@@ -245,7 +244,7 @@ extern NSString *const kFIRLibraryVersionID;
APIKey:kAPIKey
clientID:kClientID
trackingID:kTrackingID
- androidClientID:kAndroidClientID
+ androidClientID:(id _Nonnull)nil
databaseURL:kDatabaseURL
storageBucket:kStorageBucket
deepLinkURLScheme:kDeepLinkURLScheme];
diff --git a/Example/Core/Tests/FIRTestCase.m b/Example/Core/Tests/FIRTestCase.m
index 2c68b8d..b52886b 100644
--- a/Example/Core/Tests/FIRTestCase.m
+++ b/Example/Core/Tests/FIRTestCase.m
@@ -19,7 +19,6 @@ NSString *const kCustomizedAPIKey = @"customized_api_key";
NSString *const kClientID = @"correct_client_id";
NSString *const kTrackingID = @"correct_tracking_id";
NSString *const kGCMSenderID = @"correct_gcm_sender_id";
-NSString *const kAndroidClientID = @"correct_android_client_id";
NSString *const kGoogleAppID = @"1:123:ios:123abc";
NSString *const kDatabaseURL = @"https://abc-xyz-123.firebaseio.com";
NSString *const kStorageBucket = @"project-id-123.storage.firebase.com";
diff --git a/Example/Database/App/GoogleService-Info.plist b/Example/Database/App/GoogleService-Info.plist
index 89afffe..3f7547f 100644
--- a/Example/Database/App/GoogleService-Info.plist
+++ b/Example/Database/App/GoogleService-Info.plist
@@ -10,8 +10,6 @@
<string>correct_client_id</string>
<key>REVERSED_CLIENT_ID</key>
<string>correct_reversed_client_id</string>
- <key>ANDROID_CLIENT_ID</key>
- <string>correct_android_client_id</string>
<key>GOOGLE_APP_ID</key>
<string>1:123:ios:123abc</string>
<key>GCM_SENDER_ID</key>
diff --git a/Example/Messaging/App/GoogleService-Info.plist b/Example/Messaging/App/GoogleService-Info.plist
index 89afffe..3f7547f 100644
--- a/Example/Messaging/App/GoogleService-Info.plist
+++ b/Example/Messaging/App/GoogleService-Info.plist
@@ -10,8 +10,6 @@
<string>correct_client_id</string>
<key>REVERSED_CLIENT_ID</key>
<string>correct_reversed_client_id</string>
- <key>ANDROID_CLIENT_ID</key>
- <string>correct_android_client_id</string>
<key>GOOGLE_APP_ID</key>
<string>1:123:ios:123abc</string>
<key>GCM_SENDER_ID</key>
diff --git a/Example/Storage/App/GoogleService-Info.plist b/Example/Storage/App/GoogleService-Info.plist
index 89afffe..3f7547f 100644
--- a/Example/Storage/App/GoogleService-Info.plist
+++ b/Example/Storage/App/GoogleService-Info.plist
@@ -10,8 +10,6 @@
<string>correct_client_id</string>
<key>REVERSED_CLIENT_ID</key>
<string>correct_reversed_client_id</string>
- <key>ANDROID_CLIENT_ID</key>
- <string>correct_android_client_id</string>
<key>GOOGLE_APP_ID</key>
<string>1:123:ios:123abc</string>
<key>GCM_SENDER_ID</key>
diff --git a/Example/Storage/Tests/Unit/FIRStorageTests.m b/Example/Storage/Tests/Unit/FIRStorageTests.m
index 503ac94..4086f62 100644
--- a/Example/Storage/Tests/Unit/FIRStorageTests.m
+++ b/Example/Storage/Tests/Unit/FIRStorageTests.m
@@ -79,7 +79,7 @@
}
- (void)testInitWithNilURL {
- XCTAssertThrows([FIRStorage storageForApp:self.app URL:nil]);
+ XCTAssertThrows([FIRStorage storageForApp:self.app URL:(id _Nonnull)nil]);
}
- (void)testInitWithPath {