merge master into googledatalogger branch

.travis.yml

@@ -1,5 +1,5 @@
 os: osx
-osx_image: xcode10
+osx_image: xcode10.1
 language: objective-c
 cache:
   - bundler

Carthage.md

@@ -63,7 +63,7 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseStorageBinary.jso
     into the Xcode project and make sure they're added to the
     `Copy Bundle Resources` Build Phase :
     - For Firestore:
-        - ./Carthage/Build/iOS/FirebaseFirestore.framework/gRPCCertificates.bundle
+        - ./Carthage/Build/iOS/FirebaseFirestore.framework/gRPCCertificates-Firestore.bundle
     - For Invites:
         - ./Carthage/Build/iOS/FirebaseInvites.framework/GoogleSignIn.bundle
         - ./Carthage/Build/iOS/FirebaseInvites.framework/GPPACLPickerResources.bundle

Example/Auth/Tests/FIRAuthTests.m

@@ -21,7 +21,7 @@
 #import <FirebaseAuthInterop/FIRAuthInterop.h>
 #import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseCore/FIRComponent.h>
-#import <FirebaseCore/FIRComponentRegistrant.h>
+#import <FirebaseCore/FIRLibrary.h>
 
 #import "FIRAdditionalUserInfo.h"
 #import "FIRAuth_Internal.h"
@@ -225,7 +225,7 @@
 static const NSTimeInterval kWaitInterval = .5;
 
 /** Category for FIRAuth to expose FIRComponentRegistrant conformance. */
-@interface FIRAuth () <FIRComponentRegistrant>
+@interface FIRAuth () <FIRLibrary>
 @end
 
 /** @class FIRAuthTests
@@ -365,20 +365,6 @@ - (void)testLifeCycle {
   XCTAssertNil(auth);
 }
 
-/** @fn testGetUID
-    @brief Verifies that FIRApp's getUIDImplementation is correctly set by FIRAuth.
- */
-- (void)testGetUID {
-  // TODO: Remove this test once Firestore, Database, and Storage move over to the new Auth interop
-  //       library.
-  FIRApp *app = [FIRApp defaultApp];
-  XCTAssertNotNil(app.getUIDImplementation);
-  [[FIRAuth auth] signOut:NULL];
-  XCTAssertNil(app.getUIDImplementation());
-  [self waitForSignIn];
-  XCTAssertEqualObjects(app.getUIDImplementation(), kLocalID);
-}
-
 #pragma mark - Server API Tests
 
 /** @fn testFetchProvidersForEmailSuccess
@@ -2283,8 +2269,8 @@ - (void)mockSecureTokenResponseWithError:(nullable NSError *)error {
  */
 - (void)enableAutoTokenRefresh {
   XCTestExpectation *expectation = [self expectationWithDescription:@"autoTokenRefreshcallback"];
-  [[FIRAuth auth].app getTokenForcingRefresh:NO withCallback:^(NSString *_Nullable token,
-                                                                NSError *_Nullable error) {
+  [[FIRAuth auth] getTokenForcingRefresh:NO withCallback:^(NSString *_Nullable token,
+                                                           NSError *_Nullable error) {
     [expectation fulfill];
   }];
   [self waitForExpectationsWithTimeout:kExpectationTimeout handler:nil];

Example/Core/Tests/FIRAnalyticsConfigurationTest.m

@@ -99,19 +99,15 @@ - (void)testSettingAnalyticsCollectionEnabled {
   [self.observerMock setExpectationOrderMatters:YES];
   [[self.observerMock expect] notificationWithName:notificationName
                                             object:config
-                                          userInfo:@{
-                                            notificationName : @YES
-                                          }];
+                                          userInfo:@{notificationName : @YES}];
 
   // Test setting to enabled.
   [config setAnalyticsCollectionEnabled:YES];
 
   // Expect the second notification.
   [[self.observerMock expect] notificationWithName:notificationName
                                             object:config
-                                          userInfo:@{
-                                            notificationName : @NO
-                                          }];
+                                          userInfo:@{notificationName : @NO}];
 
   // Test setting to disabled.
   [config setAnalyticsCollectionEnabled:NO];

Example/Core/Tests/FIRComponentContainerTest.m

@@ -26,9 +26,26 @@ @interface FIRComponentContainer (TestInternal)
 @property(nonatomic, strong) NSMutableDictionary<NSString *, FIRComponentCreationBlock> *components;
 @property(nonatomic, strong) NSMutableDictionary<NSString *, id> *cachedInstances;
 
-+ (void)registerAsComponentRegistrant:(Class)klass inSet:(NSMutableSet<Class> *)allRegistrants;
-
++ (void)registerAsComponentRegistrant:(Class<FIRLibrary>)klass
+                                inSet:(NSMutableSet<Class> *)allRegistrants;
 - (instancetype)initWithApp:(FIRApp *)app registrants:(NSMutableSet<Class> *)allRegistrants;
+@end
+
+@interface FIRComponentContainer (TestInternalImplementations)
+- (instancetype)initWithApp:(FIRApp *)app
+                 components:(NSDictionary<NSString *, FIRComponentCreationBlock> *)components;
+@end
+
+@implementation FIRComponentContainer (TestInternalImplementations)
+
+- (instancetype)initWithApp:(FIRApp *)app
+                 components:(NSDictionary<NSString *, FIRComponentCreationBlock> *)components {
+  self = [self initWithApp:app registrants:[[NSMutableSet alloc] init]];
+  if (self) {
+    self.components = [components mutableCopy];
+  }
+  return self;
+}
 
 @end
 
@@ -47,13 +64,6 @@ - (void)testRegisteringConformingClass {
   XCTAssertTrue([allRegistrants containsObject:testClass]);
 }
 
-- (void)testRegisteringNonConformingClass {
-  NSMutableSet<Class> *allRegistrants = [NSMutableSet<Class> set];
-  XCTAssertThrows(
-      [FIRComponentContainer registerAsComponentRegistrant:[NSString class] inSet:allRegistrants]);
-  XCTAssertTrue(allRegistrants.count == 0);
-}
-
 - (void)testComponentsPopulatedOnInit {
   FIRComponentContainer *container = [self containerWithRegistrants:@ [[FIRTestClass class]]];
 
@@ -149,7 +159,6 @@ - (FIRComponentContainer *)containerWithRegistrants:(NSArray<Class> *)registrant
   for (Class c in registrants) {
     [FIRComponentContainer registerAsComponentRegistrant:c inSet:allRegistrants];
   }
-
   return [[FIRComponentContainer alloc] initWithApp:appMock registrants:allRegistrants];
 }
 

Example/Core/Tests/FIROptionsTest.m

@@ -82,8 +82,8 @@ - (void)testDefaultOptions {
 }
 
 - (void)testInitCustomizedOptions {
-  FIROptions *options =
-      [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID];
+  FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID
+                                                    GCMSenderID:kGCMSenderID];
   options.APIKey = kAPIKey;
   options.bundleID = kBundleID;
   options.clientID = kClientID;
@@ -98,8 +98,8 @@ - (void)testInitCustomizedOptions {
 }
 
 - (void)testInitWithContentsOfFile {
-  NSString *filePath =
-      [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" ofType:@"plist"];
+  NSString *filePath = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info"
+                                                       ofType:@"plist"];
   FIROptions *options = [[FIROptions alloc] initWithContentsOfFile:filePath];
   [self assertOptionsMatchDefaults:options andProjectID:YES];
   XCTAssertNil(options.deepLinkURLScheme);
@@ -136,8 +136,8 @@ - (void)assertOptionsMatchDefaults:(FIROptions *)options andProjectID:(BOOL)matc
 
 - (void)testCopyingProperties {
   NSMutableString *mutableString;
-  FIROptions *options =
-      [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID];
+  FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID
+                                                    GCMSenderID:kGCMSenderID];
   mutableString = [[NSMutableString alloc] initWithString:@"1"];
   options.APIKey = mutableString;
   [mutableString appendString:@"2"];
@@ -208,8 +208,8 @@ - (void)testCopyWithZone {
   XCTAssertEqualObjects(newOptions.deepLinkURLScheme, kDeepLinkURLScheme);
 
   // customized options
-  FIROptions *customizedOptions =
-      [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID];
+  FIROptions *customizedOptions = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID
+                                                              GCMSenderID:kGCMSenderID];
   customizedOptions.deepLinkURLScheme = kDeepLinkURLScheme;
   FIROptions *copyCustomizedOptions = [customizedOptions copy];
   [copyCustomizedOptions setDeepLinkURLScheme:kNewDeepLinkURLScheme];
@@ -466,20 +466,16 @@ - (void)testAnalyticsCollectionGlobalSwitchOverrideToDisable {
   OCMStub([appMock isDataCollectionDefaultEnabled]).andReturn(YES);
 
   // Test the three Analytics flags that override to disable Analytics collection.
-  FIROptions *collectionEnabledOptions = [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-    kFIRIsAnalyticsCollectionEnabled : @NO
-  }];
+  FIROptions *collectionEnabledOptions = [[FIROptions alloc]
+      initInternalWithOptionsDictionary:@{kFIRIsAnalyticsCollectionEnabled : @NO}];
   XCTAssertFalse(collectionEnabledOptions.isAnalyticsCollectionEnabled);
 
-  FIROptions *collectionDeactivatedOptions =
-      [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-        kFIRIsAnalyticsCollectionDeactivated : @YES
-      }];
+  FIROptions *collectionDeactivatedOptions = [[FIROptions alloc]
+      initInternalWithOptionsDictionary:@{kFIRIsAnalyticsCollectionDeactivated : @YES}];
   XCTAssertFalse(collectionDeactivatedOptions.isAnalyticsCollectionEnabled);
 
-  FIROptions *measurementEnabledOptions = [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-    kFIRIsMeasurementEnabled : @NO
-  }];
+  FIROptions *measurementEnabledOptions =
+      [[FIROptions alloc] initInternalWithOptionsDictionary:@{kFIRIsMeasurementEnabled : @NO}];
   XCTAssertFalse(measurementEnabledOptions.isAnalyticsCollectionEnabled);
 }
 
@@ -491,14 +487,12 @@ - (void)testAnalyticsCollectionGlobalSwitchOverrideToEnable {
   OCMStub([appMock isDataCollectionDefaultEnabled]).andReturn(NO);
 
   // Test the two Analytics flags that can override and enable collection.
-  FIROptions *collectionEnabledOptions = [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-    kFIRIsAnalyticsCollectionEnabled : @YES
-  }];
+  FIROptions *collectionEnabledOptions = [[FIROptions alloc]
+      initInternalWithOptionsDictionary:@{kFIRIsAnalyticsCollectionEnabled : @YES}];
   XCTAssertTrue(collectionEnabledOptions.isAnalyticsCollectionEnabled);
 
-  FIROptions *measurementEnabledOptions = [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-    kFIRIsMeasurementEnabled : @YES
-  }];
+  FIROptions *measurementEnabledOptions =
+      [[FIROptions alloc] initInternalWithOptionsDictionary:@{kFIRIsMeasurementEnabled : @YES}];
   XCTAssertTrue(measurementEnabledOptions.isAnalyticsCollectionEnabled);
 }
 
@@ -534,31 +528,27 @@ - (void)testAnalyticsCollectionExplicitlySet {
 
   // Test the old measurement flag.
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:@{}];
-  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{
-    kFIRIsMeasurementEnabled : @YES
-  }];
+  analyticsOptions =
+      [options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @YES}];
   XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
 
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:@{}];
-  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{
-    kFIRIsMeasurementEnabled : @NO
-  }];
+  analyticsOptions =
+      [options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @NO}];
   XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
 
   // For good measure, a combination of all 3 (even if they conflict).
   optionsDictionary =
-      @{kFIRIsAnalyticsCollectionDeactivated : @YES,
-        kFIRIsAnalyticsCollectionEnabled : @YES};
+      @{kFIRIsAnalyticsCollectionDeactivated : @YES, kFIRIsAnalyticsCollectionEnabled : @YES};
   options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
-  analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{
-    kFIRIsMeasurementEnabled : @NO
-  }];
+  analyticsOptions =
+      [options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @NO}];
   XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
 }
 
 - (void)testModifyingOptionsThrows {
-  FIROptions *options =
-      [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID GCMSenderID:kGCMSenderID];
+  FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:kGoogleAppID
+                                                    GCMSenderID:kGCMSenderID];
   options.editingLocked = YES;
 
   // Modification to every property should result in an exception.

Example/Core/Tests/FIRTestComponents.h

@@ -16,7 +16,7 @@
 
 #import <FirebaseCore/FIRComponent.h>
 #import <FirebaseCore/FIRComponentContainer.h>
-#import <FirebaseCore/FIRComponentRegistrant.h>
+#import <FirebaseCore/FIRLibrary.h>
 
 @protocol FIRComponentRegistrant;
 
@@ -28,13 +28,12 @@
 @end
 
 /// A test class that is a component registrant.
-@interface FIRTestClass
-    : NSObject <FIRTestProtocol, FIRComponentRegistrant, FIRComponentLifecycleMaintainer>
+@interface FIRTestClass : NSObject <FIRTestProtocol, FIRComponentLifecycleMaintainer, FIRLibrary>
 @end
 
 /// A test class that is a component registrant, a duplicate of FIRTestClass.
 @interface FIRTestClassDuplicate
-    : NSObject <FIRTestProtocol, FIRComponentRegistrant, FIRComponentLifecycleMaintainer>
+    : NSObject <FIRTestProtocol, FIRComponentLifecycleMaintainer, FIRLibrary>
 @end
 
 #pragma mark - Eager Component
@@ -47,7 +46,7 @@
 /// A test class that is a component registrant that provides a component requiring eager
 /// instantiation, and is cached for easier validation that it was instantiated.
 @interface FIRTestClassEagerCached
-    : NSObject <FIRTestProtocolEagerCached, FIRComponentRegistrant, FIRComponentLifecycleMaintainer>
+    : NSObject <FIRTestProtocol, FIRComponentLifecycleMaintainer, FIRLibrary>
 @end
 
 #pragma mark - Cached Component
@@ -59,5 +58,5 @@
 /// A test class that is a component registrant that provides a component that requests to be
 /// cached.
 @interface FIRTestClassCached
-    : NSObject <FIRTestProtocolCached, FIRComponentRegistrant, FIRComponentLifecycleMaintainer>
+    : NSObject <FIRTestProtocol, FIRComponentLifecycleMaintainer, FIRLibrary>
 @end

Example/Core/Tests/FIRTestComponents.m

@@ -47,7 +47,7 @@ @implementation FIRTestClassDuplicate
 - (void)doSomething {
 }
 
-/// FIRComponentRegistrant conformance.
+/// FIRLibrary conformance.
 + (nonnull NSArray<FIRComponent *> *)componentsToRegister {
   FIRComponent *testComponent =
       [FIRComponent componentWithProtocol:@protocol(FIRTestProtocol)
@@ -72,7 +72,7 @@ @implementation FIRTestClassEagerCached
 - (void)doSomethingFaster {
 }
 
-/// FIRComponentRegistrant conformance.
+/// FIRLibrary conformance.
 + (nonnull NSArray<FIRComponent *> *)componentsToRegister {
   FIRComponent *testComponent = [FIRComponent
       componentWithProtocol:@protocol(FIRTestProtocolEagerCached)
@@ -92,13 +92,16 @@ - (void)doSomethingFaster {
 - (void)appWillBeDeleted:(FIRApp *)app {
 }
 
+- (void)doSomething {
+}
+
 @end
 
 #pragma mark - Cached Component
 
 @implementation FIRTestClassCached
 
-/// FIRComponentRegistrant conformance.
+/// FIRLibrary conformance.
 + (nonnull NSArray<FIRComponent *> *)componentsToRegister {
   FIRComponent *testComponent = [FIRComponent
       componentWithProtocol:@protocol(FIRTestProtocolCached)
@@ -115,4 +118,7 @@ @implementation FIRTestClassCached
 - (void)appWillBeDeleted:(FIRApp *)app {
 }
 
+- (void)doSomething {
+}
+
 @end

Example/Database/Tests/Helpers/FIRFakeApp.m

@@ -39,6 +39,27 @@ @interface FIRDatabaseComponent (Internal)
 - (instancetype)initWithApp:(FIRApp *)app;
 @end
 
+@interface FIRComponentContainer (TestInternal)
+@property(nonatomic, strong) NSMutableDictionary<NSString *, FIRComponentCreationBlock> *components;
+@end
+
+@interface FIRComponentContainer (TestInternalImplementations)
+- (instancetype)initWithApp:(FIRApp *)app
+                 components:(NSDictionary<NSString *, FIRComponentCreationBlock> *)components;
+@end
+
+@implementation FIRComponentContainer (TestInternalImplementations)
+
+- (instancetype)initWithApp:(FIRApp *)app
+                 components:(NSDictionary<NSString *, FIRComponentCreationBlock> *)components {
+  self = [self initWithApp:app registrants:[[NSMutableSet alloc] init]];
+  if (self) {
+    self.components = [components mutableCopy];
+  }
+  return self;
+}
+@end
+
 @implementation FIRFakeApp
 
 - (instancetype)initWithName:(NSString *)name URL:(NSString *)url {

Example/DynamicLinks/App/iOS/DL-Info.plist

@@ -29,10 +29,6 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>