Merge commit '1bb530b6781be613e049595e84f8189c9cd354e0' into bs-databaseinterop

* commit '1bb530b6781be613e049595e84f8189c9cd354e0':
  Register Database with Interop

    Add AuthInterop dependency
    Have Database register with Interop component container
    Add weak dependency on Auth
    Cleaned up imports

Author: bstpierr

Firebase/Database/Api/FIRDatabase.m

@@ -16,26 +16,34 @@
 
 #import <Foundation/Foundation.h>
 
+#import <FirebaseAuthInterop/FIRAuthInterop.h>
 #import <FirebaseCore/FIRAppInternal.h>
+#import <FirebaseCore/FIRComponent.h>
+#import <FirebaseCore/FIRComponentContainer.h>
+#import <FirebaseCore/FIRDependency.h>
 #import <FirebaseCore/FIRLogger.h>
+#import <FirebaseCore/FIROptions.h>
 
 #import "FIRDatabase.h"
-#import "FIRDatabase_Private.h"
+#import "FIRDatabaseConfig_Private.h"
 #import "FIRDatabaseQuery_Private.h"
+#import "FIRDatabaseReference_Private.h"
+#import "FIRDatabase_Private.h"
+#import "FRepoInfo.h"
 #import "FRepoManager.h"
 #import "FValidation.h"
-#import "FIRDatabaseConfig_Private.h"
-#import "FRepoInfo.h"
-#import "FIRDatabaseConfig.h"
-#import "FIRDatabaseReference_Private.h"
-#import <FirebaseCore/FIROptions.h>
 
 @interface FIRDatabase ()
 @property (nonatomic, strong) FRepoInfo *repoInfo;
 @property (nonatomic, strong) FIRDatabaseConfig *config;
 @property (nonatomic, strong) FRepo *repo;
 @end
 
+
+// Empty protocol for use with Interop registration.
+@protocol FIRDatabaseNilProtocol
+@end
+
 @implementation FIRDatabase
 
 /** A NSMutableDictionary of FirebaseApp name and FRepoInfo to FirebaseDatabase instance. */
@@ -69,6 +77,23 @@ + (void)load {
           }
       }
   }];
+  [FIRComponentContainer registerAsComponentRegistrant:self];
+}
+
++ (NSArray<FIRComponent *> *)componentsToRegister {
+    FIRDependency *auth =
+        [FIRDependency dependencyWithProtocol:@protocol(FIRAuthInterop)
+                                   isRequired:NO];
+    FIRComponentCreationBlock creationBlock =
+        ^id _Nullable(FIRComponentContainer *container, BOOL *isCacheable) {
+        return [self databaseForApp:container.app];
+    };
+    FIRComponent *databaseProvider =
+        [FIRComponent componentWithProtocol:@protocol(FIRDatabaseNilProtocol)
+                        instantiationTiming:FIRInstantiationTimingLazy
+                               dependencies:@[ auth ]
+                              creationBlock:creationBlock];
+    return @[ databaseProvider ];
 }
 
 /**

FirebaseDatabase.podspec

@@ -32,6 +32,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
   s.libraries = ['c++', 'icucore']
   s.frameworks = ['CFNetwork', 'Security', 'SystemConfiguration']
   s.dependency 'leveldb-library', '~> 1.18'
+  s.dependency 'FirebaseAuthInterop', '~> 1.0'
   s.dependency 'FirebaseCore', '~> 5.0'
   s.pod_target_xcconfig = {
     'GCC_PREPROCESSOR_DEFINITIONS' =>