Skip to content

[v11] Remove unused FIRDependency class #13053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Crashlytics/Crashlytics/FIRCrashlytics.m
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,6 @@ + (void)load {
}

+ (NSArray<FIRComponent *> *)componentsToRegister {
FIRDependency *analyticsDep =
[FIRDependency dependencyWithProtocol:@protocol(FIRAnalyticsInterop)];

FIRDependency *sessionsDep =
[FIRDependency dependencyWithProtocol:@protocol(FIRSessionsProvider)];

FIRComponentCreationBlock creationBlock =
^id _Nullable(FIRComponentContainer *container, BOOL *isCacheable) {
if (!container.app.isDefaultApp) {
Expand All @@ -259,7 +253,6 @@ + (void)load {
FIRComponent *component =
[FIRComponent componentWithProtocol:@protocol(FIRCrashlyticsInstanceProvider)
instantiationTiming:FIRInstantiationTimingEagerInDefaultApp
dependencies:@[ analyticsDep, sessionsDep ]
creationBlock:creationBlock];
return @[ component ];
}
Expand Down
3 changes: 0 additions & 3 deletions FirebaseABTesting/Sources/FIRExperimentController.m
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ + (void)load {
}

+ (nonnull NSArray<FIRComponent *> *)componentsToRegister {
FIRDependency *analyticsDep = [FIRDependency dependencyWithProtocol:@protocol(FIRAnalyticsInterop)
isRequired:NO];
FIRComponentCreationBlock creationBlock =
^id _Nullable(FIRComponentContainer *container, BOOL *isCacheable) {
// Ensure it's cached so it returns the same instance every time ABTesting is called.
Expand All @@ -139,7 +137,6 @@ + (void)load {
};
FIRComponent *abtProvider = [FIRComponent componentWithProtocol:@protocol(FIRABTInstanceProvider)
instantiationTiming:FIRInstantiationTimingLazy
dependencies:@[ analyticsDep ]
creationBlock:creationBlock];

return @[ abtProvider ];
Expand Down
1 change: 0 additions & 1 deletion FirebaseAppCheck/Sources/Core/FIRAppCheckComponent.m
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ + (void)load {
FIRComponent *appCheckProvider =
[FIRComponent componentWithProtocol:@protocol(FIRAppCheckInterop)
instantiationTiming:FIRInstantiationTimingAlwaysEager
dependencies:@[]
creationBlock:creationBlock];
return @[ appCheckProvider ];
}
Expand Down
1 change: 0 additions & 1 deletion FirebaseAppDistribution/Sources/FIRAppDistribution.m
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ + (void)load {
FIRComponent *component =
[FIRComponent componentWithProtocol:@protocol(FIRAppDistributionInstanceProvider)
instantiationTiming:FIRInstantiationTimingEagerInDefaultApp
dependencies:@[]
creationBlock:creationBlock];
return @[ component ];
}
Expand Down
2 changes: 0 additions & 2 deletions FirebaseAuth/Sources/Swift/Auth/AuthComponent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@ class AuthComponent: NSObject, Library, ComponentLifecycleMaintainer {
isCacheable.pointee = true
return Auth(app: app)
}
let appCheckInterop = Dependency(with: AppCheckInterop.self, isRequired: false)
let authInterop = Component(AuthInterop.self,
instantiationTiming: .alwaysEager,
dependencies: [appCheckInterop],
creationBlock: authCreationBlock)
return [authInterop]
}
Expand Down
9 changes: 1 addition & 8 deletions FirebaseCore/Extension/FIRComponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ typedef _Nullable id (^FIRComponentCreationBlock)(FIRComponentContainer *contain
BOOL *isCacheable)
NS_SWIFT_NAME(ComponentCreationBlock);

@class FIRDependency;

/// Describes the timing of instantiation. Note: new components should default to lazy unless there
/// is a strong reason to be eager.
typedef NS_ENUM(NSInteger, FIRInstantiationTiming) {
Expand All @@ -52,9 +50,6 @@ NS_SWIFT_NAME(Component)
/// The timing of instantiation.
@property(nonatomic, readonly) FIRInstantiationTiming instantiationTiming;

/// An array of dependencies for the component.
@property(nonatomic, copy, readonly) NSArray<FIRDependency *> *dependencies;

/// A block to instantiate an instance of the component with the appropriate dependencies.
@property(nonatomic, copy, readonly) FIRComponentCreationBlock creationBlock;

Expand All @@ -72,14 +67,12 @@ NS_SWIFT_NAME(init(_:creationBlock:));
/// @param protocol - The protocol describing functionality provided by the component.
/// @param instantiationTiming - When the component should be initialized. Use .lazy unless there's
/// a good reason to be instantiated earlier.
/// @param dependencies - Any dependencies the `implementingClass` has, optional or required.
/// @param creationBlock - A block to instantiate the component with a container, and if
/// @return A component that can be registered with the component container.
+ (instancetype)componentWithProtocol:(Protocol *)protocol
instantiationTiming:(FIRInstantiationTiming)instantiationTiming
dependencies:(NSArray<FIRDependency *> *)dependencies
creationBlock:(FIRComponentCreationBlock)creationBlock
NS_SWIFT_NAME(init(_:instantiationTiming:dependencies:creationBlock:));
NS_SWIFT_NAME(init(_:instantiationTiming:creationBlock:));

// clang-format on

Expand Down
45 changes: 0 additions & 45 deletions FirebaseCore/Extension/FIRDependency.h

This file was deleted.

1 change: 0 additions & 1 deletion FirebaseCore/Extension/FirebaseCoreInternal.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#import "FIRComponent.h"
#import "FIRComponentContainer.h"
#import "FIRComponentType.h"
#import "FIRDependency.h"
#import "FIRHeartbeatLogger.h"
#import "FIRLibrary.h"
#import "FIRLogger.h"
Expand Down
7 changes: 0 additions & 7 deletions FirebaseCore/Sources/FIRComponent.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@
#import "FirebaseCore/Extension/FIRComponent.h"

#import "FirebaseCore/Extension/FIRComponentContainer.h"
#import "FirebaseCore/Extension/FIRDependency.h"

@interface FIRComponent ()

- (instancetype)initWithProtocol:(Protocol *)protocol
instantiationTiming:(FIRInstantiationTiming)instantiationTiming
dependencies:(NSArray<FIRDependency *> *)dependencies
creationBlock:(FIRComponentCreationBlock)creationBlock;

@end
Expand All @@ -34,29 +32,24 @@ + (instancetype)componentWithProtocol:(Protocol *)protocol
creationBlock:(FIRComponentCreationBlock)creationBlock {
return [[FIRComponent alloc] initWithProtocol:protocol
instantiationTiming:FIRInstantiationTimingLazy
dependencies:@[]
creationBlock:creationBlock];
}

+ (instancetype)componentWithProtocol:(Protocol *)protocol
instantiationTiming:(FIRInstantiationTiming)instantiationTiming
dependencies:(NSArray<FIRDependency *> *)dependencies
creationBlock:(FIRComponentCreationBlock)creationBlock {
return [[FIRComponent alloc] initWithProtocol:protocol
instantiationTiming:instantiationTiming
dependencies:dependencies
creationBlock:creationBlock];
}

- (instancetype)initWithProtocol:(Protocol *)protocol
instantiationTiming:(FIRInstantiationTiming)instantiationTiming
dependencies:(NSArray<FIRDependency *> *)dependencies
creationBlock:(FIRComponentCreationBlock)creationBlock {
self = [super init];
if (self) {
_protocol = protocol;
_instantiationTiming = instantiationTiming;
_dependencies = [dependencies copy];
_creationBlock = creationBlock;
}
return self;
Expand Down
44 changes: 0 additions & 44 deletions FirebaseCore/Sources/FIRDependency.m

This file was deleted.

3 changes: 0 additions & 3 deletions FirebaseCore/Tests/Unit/FIRTestComponents.m
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ - (void)doSomethingFaster {
FIRComponent *testComponent = [FIRComponent
componentWithProtocol:@protocol(FIRTestProtocolEagerCached)
instantiationTiming:FIRInstantiationTimingAlwaysEager
dependencies:@[]
creationBlock:^id _Nullable(FIRComponentContainer *_Nonnull container,
BOOL *_Nonnull isCacheable) {
FIRTestClassEagerCached *instance = [[FIRTestClassEagerCached alloc] init];
Expand Down Expand Up @@ -144,11 +143,9 @@ - (void)appWillBeDeleted:(nonnull FIRApp *)app {
}

+ (nonnull NSArray<FIRComponent *> *)componentsToRegister {
FIRDependency *dep = [FIRDependency dependencyWithProtocol:@protocol(FIRTestProtocolCached)];
FIRComponent *testComponent = [FIRComponent
componentWithProtocol:@protocol(FIRTestProtocolCachedWithDep)
instantiationTiming:FIRInstantiationTimingLazy
dependencies:@[ dep ]
creationBlock:^id _Nullable(FIRComponentContainer *_Nonnull container,
BOOL *_Nonnull isCacheable) {
// Fetch from the container in the instantiation block.
Expand Down
4 changes: 0 additions & 4 deletions FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ + (void)load {
#pragma mark - FIRComponentRegistrant

+ (NSArray<FIRComponent *> *)componentsToRegister {
FIRDependency *authDep =
[FIRDependency dependencyWithProtocol:@protocol(FIRAuthInterop)
isRequired:NO];
FIRComponentCreationBlock creationBlock =
^id _Nullable(FIRComponentContainer *container, BOOL *isCacheable) {
*isCacheable = YES;
Expand All @@ -71,7 +68,6 @@ + (void)load {
FIRComponent *databaseProvider =
[FIRComponent componentWithProtocol:@protocol(FIRDatabaseProvider)
instantiationTiming:FIRInstantiationTimingLazy
dependencies:@[ authDep ]
creationBlock:creationBlock];
return @[ databaseProvider ];
}
Expand Down
4 changes: 0 additions & 4 deletions FirebaseDynamicLinks/Sources/FIRDynamicLinks.m
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ + (void)load {
}

+ (nonnull NSArray<FIRComponent *> *)componentsToRegister {
// Product requirement is enforced by CocoaPod. Not technical requirement for analytics.
FIRDependency *analyticsDep = [FIRDependency dependencyWithProtocol:@protocol(FIRAnalyticsInterop)
isRequired:NO];
FIRComponentCreationBlock creationBlock =
^id _Nullable(FIRComponentContainer *container, BOOL *isCacheable) {
// Don't return an instance when it's not the default app.
Expand All @@ -138,7 +135,6 @@ + (void)load {
FIRComponent *dynamicLinksProvider =
[FIRComponent componentWithProtocol:@protocol(FIRDynamicLinksInstanceProvider)
instantiationTiming:FIRInstantiationTimingEagerInDefaultApp
dependencies:@[ analyticsDep ]
creationBlock:creationBlock];

return @[ dynamicLinksProvider ];
Expand Down
3 changes: 0 additions & 3 deletions FirebaseInAppMessaging/Sources/FIRInAppMessaging.m
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ + (void)load {
}

+ (nonnull NSArray<FIRComponent *> *)componentsToRegister {
FIRDependency *analyticsDep = [FIRDependency dependencyWithProtocol:@protocol(FIRAnalyticsInterop)
isRequired:YES];
FIRComponentCreationBlock creationBlock =
^id _Nullable(FIRComponentContainer *container, BOOL *isCacheable) {
// Ensure it's cached so it returns the same instance every time fiam is called.
Expand All @@ -62,7 +60,6 @@ + (void)load {
FIRComponent *fiamProvider =
[FIRComponent componentWithProtocol:@protocol(FIRInAppMessagingInstanceProvider)
instantiationTiming:FIRInstantiationTimingLazy
dependencies:@[ analyticsDep ]
creationBlock:creationBlock];

return @[ fiamProvider ];
Expand Down
1 change: 0 additions & 1 deletion FirebaseInstallations/Source/Library/FIRInstallations.m
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ + (void)load {
FIRComponent *installationsProvider =
[FIRComponent componentWithProtocol:@protocol(FIRInstallationsInstanceProvider)
instantiationTiming:FIRInstantiationTimingAlwaysEager
dependencies:@[]
creationBlock:creationBlock];
return @[ installationsProvider ];
}
Expand Down
3 changes: 0 additions & 3 deletions FirebaseMessaging/Sources/FIRMessaging.m
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,6 @@ + (void)load {
}

+ (nonnull NSArray<FIRComponent *> *)componentsToRegister {
FIRDependency *analyticsDep = [FIRDependency dependencyWithProtocol:@protocol(FIRAnalyticsInterop)
isRequired:NO];
FIRComponentCreationBlock creationBlock =
^id _Nullable(FIRComponentContainer *container, BOOL *isCacheable) {
if (!container.app.isDefaultApp) {
Expand Down Expand Up @@ -198,7 +196,6 @@ + (void)load {
FIRComponent *messagingProvider =
[FIRComponent componentWithProtocol:@protocol(FIRMessagingInterop)
instantiationTiming:FIRInstantiationTimingEagerInDefaultApp
dependencies:@[ analyticsDep ]
creationBlock:creationBlock];

return @[ messagingProvider ];
Expand Down
4 changes: 0 additions & 4 deletions FirebasePerformance/Sources/FPRClient.m
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ + (void)load {
#pragma mark - Component registration system

+ (nonnull NSArray<FIRComponent *> *)componentsToRegister {
FIRDependency *sessionsDep =
[FIRDependency dependencyWithProtocol:@protocol(FIRSessionsProvider)];

FIRComponentCreationBlock creationBlock =
^id _Nullable(FIRComponentContainer *container, BOOL *isCacheable) {
if (!container.app.isDefaultApp) {
Expand Down Expand Up @@ -108,7 +105,6 @@ + (void)load {
FIRComponent *component =
[FIRComponent componentWithProtocol:@protocol(FIRPerformanceProvider)
instantiationTiming:FIRInstantiationTimingEagerInDefaultApp
dependencies:@[ sessionsDep ]
creationBlock:creationBlock];

return @[ component ];
Expand Down
4 changes: 0 additions & 4 deletions FirebaseRemoteConfig/Sources/FIRRemoteConfigComponent.m
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,9 @@ + (void)load {
#pragma mark - Interoperability

+ (NSArray<FIRComponent *> *)componentsToRegister {
FIRDependency *analyticsDep = [FIRDependency dependencyWithProtocol:@protocol(FIRAnalyticsInterop)
isRequired:NO];
FIRComponent *rcProvider = [FIRComponent
componentWithProtocol:@protocol(FIRRemoteConfigProvider)
instantiationTiming:FIRInstantiationTimingAlwaysEager
dependencies:@[ analyticsDep ]
creationBlock:^id _Nullable(FIRComponentContainer *container, BOOL *isCacheable) {
// Cache the component so instances of Remote Config are cached.
*isCacheable = YES;
Expand All @@ -135,7 +132,6 @@ + (void)load {
FIRComponent *rcInterop = [FIRComponent
componentWithProtocol:@protocol(FIRRemoteConfigInterop)
instantiationTiming:FIRInstantiationTimingAlwaysEager
dependencies:@[]
creationBlock:^id _Nullable(FIRComponentContainer *container, BOOL *isCacheable) {
// Cache the component so instances of Remote Config are cached.
*isCacheable = YES;
Expand Down
3 changes: 1 addition & 2 deletions FirebaseSessions/Sources/FirebaseSessions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,7 @@ private enum GoogleDataTransportConfig {

static func componentsToRegister() -> [Component] {
return [Component(SessionsProvider.self,
instantiationTiming: .alwaysEager,
dependencies: []) { container, isCacheable in
instantiationTiming: .alwaysEager) { container, isCacheable in
// Sessions SDK only works for the default app
guard let app = container.app, app.isDefaultApp else { return nil }
isCacheable.pointee = true
Expand Down
Loading
Loading