fixes

Author: paulb777

FirebaseCore/InternalObjC/FIRComponentContainer.m

@@ -22,6 +22,33 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@interface FIRComponentContainer (Private)
+
+/// Initializes a container for a given app. This should only be called by the app itself.
+- (instancetype)initWithApp:(FIRApp *)app
+               isDefaultApp:(BOOL)isDefaultApp
+             isAppForARCore:(BOOL)isAppForARCore;
+
+/// Retrieves an instance that conforms to the specified protocol. This will return `nil` if the
+/// protocol wasn't registered, or if the instance couldn't be instantiated for the provided app.
+- (nullable id)instanceForProtocol:(Protocol *)protocol
+    NS_SWIFT_UNAVAILABLE("Use `instance(for:)` from the FirebaseCoreExtension module instead.");
+
+/// Instantiates all the components that have registered as "eager" after initialization.
+- (void)instantiateEagerComponents;
+
+/// Remove all of the cached instances stored and allow them to clean up after themselves.
+- (void)removeAllCachedInstances;
+
+/// Removes all the components. After calling this method no new instances will be created.
+- (void)removeAllComponents;
+
+/// Register a class to provide components for the interoperability system. The class should conform
+/// to `FIRComponentRegistrant` and provide an array of `FIRComponent` objects.
++ (void)registerAsComponentRegistrant:(Class<FIRLibrary>)klass;
+
+@end
+
 @interface FIRComponentContainer ()
 
 /// The dictionary of components that are registered for a particular app. The key is an `NSString`

FirebaseCore/InternalObjC/FIRComponentType.m

@@ -16,7 +16,15 @@
 
 #import "FirebaseCore/InternalObjC/FIRComponentType.h"
 
-#import "FirebaseCore/InternalObjC/FIRComponentContainerInternal.h"
+#import "FirebaseCore/InternalObjC/FIRComponentContainer.h"
+
+@interface FIRComponentContainer (InstanceForProtocol)
+
+/// Retrieves an instance that conforms to the specified protocol. This will return `nil` if the
+/// protocol wasn't registered, or if the instance couldn't be instantiated for the provided app.
+- (nullable id)instanceForProtocol:(Protocol *)protocol
+    NS_SWIFT_UNAVAILABLE("Use `instance(for:)` from the FirebaseCoreExtension module instead.");
+@end
 
 @implementation FIRComponentType
 

FirebaseCore/Sources/FIRApp.m

@@ -28,22 +28,23 @@
 
 #import "FirebaseCore/Sources/Public/FirebaseCore/FIRApp.h"
 
+@import FirebaseCoreInternal;
+#if SWIFT_PACKAGE
+@import FirebaseCoreInternalObjC;
+#endif
+
 #import "FirebaseCore/Sources/FIRAnalyticsConfiguration.h"
 #import "FirebaseCore/Sources/FIRBundleUtil.h"
 #import "FirebaseCore/Sources/FIRConfigurationInternal.h"
 #import "FirebaseCore/Sources/FIRFirebaseUserAgent.h"
 
 #import "FirebaseCore/Extension/FIRAppInternal.h"
 #import "FirebaseCore/Extension/FIRHeartbeatLogger.h"
+#import "FirebaseCore/Sources/FIRComponentContainerInternal.h"
 #import "FirebaseCore/Sources/FIROptionsInternal.h"
 #import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h"
 #import "FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h"
 
-@import FirebaseCoreInternal;
-#if SWIFT_PACKAGE
-@import FirebaseCoreInternalObjC;
-#endif
-
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 
 #import <objc/runtime.h>

FirebaseCore/InternalObjC/FIRComponentContainerInternal.h renamed to FirebaseCore/Sources/FIRComponentContainerInternal.h

@@ -15,7 +15,12 @@
  */
 #import <Foundation/Foundation.h>
 
-#import "FIRComponentContainer.h"
+@import FirebaseCoreInternal;
+#ifdef SWIFT_PACKAGE
+@import FirebaseCoreInternalObjC;
+#else
+@import FirebaseCoreInternal;
+#endif
 
 @class FIRApp;
 @protocol FIRLibrary;

FirebaseCore/Tests/Unit/FIRComponentContainerTest.m

@@ -16,7 +16,6 @@
 
 #import "FirebaseCore/Extension/FIRAppInternal.h"
 #import "FirebaseCore/InternalObjC/FIRComponentContainer.h"
-#import "FirebaseCore/InternalObjC/FIRComponentContainerInternal.h"
 #import "FirebaseCore/InternalObjC/FIRComponentType.h"
 #import "FirebaseCore/Tests/Unit/FIRTestComponents.h"
 #import "SharedTestUtilities/FIROptionsMock.h"
@@ -34,6 +33,16 @@ + (void)registerAsComponentRegistrant:(Class<FIRLibrary>)klass
 - (instancetype)initWithApp:(FIRApp *)app
                isDefaultApp:(BOOL)isDefaultApp
                 registrants:(NSMutableSet<Class> *)allRegistrants;
+
+/// Instantiates all the components that have registered as "eager" after initialization.
+- (void)instantiateEagerComponents;
+
+/// Remove all of the cached instances stored and allow them to clean up after themselves.
+- (void)removeAllCachedInstances;
+
+/// Removes all the components. After calling this method no new instances will be created.
+- (void)removeAllComponents;
+
 @end
 
 @interface FIRComponentContainer (TestInternalImplementations)

FirebaseCore/Tests/Unit/FIRComponentTypeTest.m

@@ -14,11 +14,19 @@
 
 #import "FirebaseCore/Tests/Unit/FIRTestCase.h"
 
-#import "FirebaseCore/InternalObjC/FIRComponentContainerInternal.h"
 #import "FirebaseCore/InternalObjC/FIRComponentType.h"
 
 #import "FirebaseCore/Tests/Unit/FIRTestComponents.h"
 
+@interface FIRComponentContainer (Private)
+
+/// Retrieves an instance that conforms to the specified protocol. This will return `nil` if the
+/// protocol wasn't registered, or if the instance couldn't be instantiated for the provided app.
+- (nullable id)instanceForProtocol:(Protocol *)protocol
+    NS_SWIFT_UNAVAILABLE("Use `instance(for:)` from the FirebaseCoreExtension module instead.");
+
+@end
+
 @interface FIRComponentTypeTest : FIRTestCase
 
 @property(nonatomic, strong) id componentContainerMock;

FirebaseCore/Tests/Unit/FIRTestComponents.m

@@ -16,7 +16,6 @@
 
 #import "FirebaseCore/Extension/FIRAppInternal.h"
 #import "FirebaseCore/InternalObjC/FIRComponentContainer.h"
-#import "FirebaseCore/InternalObjC/FIRComponentContainerInternal.h"
 #import "FirebaseCore/InternalObjC/FIRComponentType.h"
 #import "FirebaseCore/Tests/Unit/FIRTestComponents.h"
 

FirebaseStorage/Tests/Unit/StorageComponentTests.swift

@@ -15,7 +15,7 @@
 import Foundation
 
 import FirebaseCore
-import FirebaseCoreExtension
+@_implementationOnly import FirebaseCoreExtension
 @testable import FirebaseStorage
 
 import FirebaseAppCheckInterop