From a84704f65b4134f45ca6e2dad2e885ff36731207 Mon Sep 17 00:00:00 2001
From: davidair <davidair@users.noreply.github.com>
Date: Mon, 8 Jan 2018 10:41:25 -0500
Subject: Removing an obsolete setting from plist files (#617)

* Removing an obsolete setting from plist files

* Fixing Unit Tests

* Fixing nullability
---
 Example/Core/Tests/FIROptionsTest.m | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'Example/Core/Tests/FIROptionsTest.m')

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];
-- 
cgit v1.2.3