diff --git a/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/FirebaseAppCheckDebugRegistrar.java b/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/FirebaseAppCheckDebugRegistrar.java index 2b79ba545b8..b2a525f161b 100644 --- a/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/FirebaseAppCheckDebugRegistrar.java +++ b/appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/FirebaseAppCheckDebugRegistrar.java @@ -29,10 +29,10 @@ */ @KeepForSdk public class FirebaseAppCheckDebugRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-app-check-debug"; @Override public List> getComponents() { - return Arrays.asList( - LibraryVersionComponent.create("fire-app-check-debug", BuildConfig.VERSION_NAME)); + return Arrays.asList(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrar.java b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrar.java index d71af7a7a88..b1af71a1651 100644 --- a/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrar.java +++ b/appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrar.java @@ -29,10 +29,10 @@ */ @KeepForSdk public class FirebaseAppCheckPlayIntegrityRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-app-check-play-integrity"; @Override public List> getComponents() { - return Arrays.asList( - LibraryVersionComponent.create("fire-app-check-play-integrity", BuildConfig.VERSION_NAME)); + return Arrays.asList(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/FirebaseAppCheckSafetyNetRegistrar.java b/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/FirebaseAppCheckSafetyNetRegistrar.java index b922c56f17e..9e7080fda7c 100644 --- a/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/FirebaseAppCheckSafetyNetRegistrar.java +++ b/appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/FirebaseAppCheckSafetyNetRegistrar.java @@ -29,10 +29,10 @@ */ @KeepForSdk public class FirebaseAppCheckSafetyNetRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-app-check-safety-net"; @Override public List> getComponents() { - return Arrays.asList( - LibraryVersionComponent.create("fire-app-check-safety-net", BuildConfig.VERSION_NAME)); + return Arrays.asList(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java index e1ea851563b..8a52acdf20a 100644 --- a/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java +++ b/appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java @@ -35,11 +35,13 @@ */ @KeepForSdk public class FirebaseAppCheckRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-app-check"; @Override public List> getComponents() { return Arrays.asList( Component.builder(FirebaseAppCheck.class, (InternalAppCheckTokenProvider.class)) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.optionalProvider(HeartBeatController.class)) .factory( @@ -50,6 +52,6 @@ public List> getComponents() { .alwaysEager() .build(), HeartBeatConsumerComponent.create(), - LibraryVersionComponent.create("fire-app-check", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-abt/src/main/java/com/google/firebase/abt/component/AbtRegistrar.java b/firebase-abt/src/main/java/com/google/firebase/abt/component/AbtRegistrar.java index 862b42b5770..137adab8633 100644 --- a/firebase-abt/src/main/java/com/google/firebase/abt/component/AbtRegistrar.java +++ b/firebase-abt/src/main/java/com/google/firebase/abt/component/AbtRegistrar.java @@ -32,11 +32,13 @@ */ @Keep public class AbtRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-abt"; @Override public List> getComponents() { return Arrays.asList( Component.builder(AbtComponent.class) + .name(LIBRARY_NAME) .add(Dependency.required(Context.class)) .add(Dependency.optionalProvider(AnalyticsConnector.class)) .factory( @@ -45,6 +47,6 @@ public List> getComponents() { container.get(Context.class), container.getProvider(AnalyticsConnector.class))) .build(), - LibraryVersionComponent.create("fire-abt", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionApiRegistrar.java b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionApiRegistrar.java index 27497c5a867..5cf9aeeb0c0 100644 --- a/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionApiRegistrar.java +++ b/firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionApiRegistrar.java @@ -32,18 +32,20 @@ */ @Keep public class FirebaseAppDistributionApiRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-appdistribution-api"; @Override public @NonNull List> getComponents() { return Arrays.asList( Component.builder(FirebaseAppDistributionProxy.class) + .name(LIBRARY_NAME) .add(Dependency.optionalProvider(FirebaseAppDistribution.class)) .factory(this::buildFirebaseAppDistributionProxy) // construct FirebaseAppDistribution instance on startup so we can register for // activity lifecycle callbacks before the API is called .alwaysEager() .build(), - LibraryVersionComponent.create("fire-appdistribution-api", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } private FirebaseAppDistributionProxy buildFirebaseAppDistributionProxy( diff --git a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionRegistrar.java b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionRegistrar.java index 56f7829416f..59b45a2e9f0 100644 --- a/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionRegistrar.java +++ b/firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionRegistrar.java @@ -37,6 +37,7 @@ */ @Keep public class FirebaseAppDistributionRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-appdistribution"; private static String TAG = "Registrar:"; @@ -44,6 +45,7 @@ public class FirebaseAppDistributionRegistrar implements ComponentRegistrar { public @NonNull List> getComponents() { return Arrays.asList( Component.builder(FirebaseAppDistribution.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.requiredProvider(FirebaseInstallationsApi.class)) .factory(this::buildFirebaseAppDistribution) @@ -51,7 +53,7 @@ public class FirebaseAppDistributionRegistrar implements ComponentRegistrar { // activity lifecycle callbacks before the API is called .alwaysEager() .build(), - LibraryVersionComponent.create("fire-appdistribution", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } private FirebaseAppDistribution buildFirebaseAppDistribution(ComponentContainer container) { diff --git a/firebase-components/firebase-dynamic-module-support/src/main/java/com/google/firebase/dynamicloading/DynamicLoadingRegistrar.java b/firebase-components/firebase-dynamic-module-support/src/main/java/com/google/firebase/dynamicloading/DynamicLoadingRegistrar.java index 2aad8b5ba7d..2eb941f7a93 100644 --- a/firebase-components/firebase-dynamic-module-support/src/main/java/com/google/firebase/dynamicloading/DynamicLoadingRegistrar.java +++ b/firebase-components/firebase-dynamic-module-support/src/main/java/com/google/firebase/dynamicloading/DynamicLoadingRegistrar.java @@ -23,11 +23,13 @@ import java.util.List; public class DynamicLoadingRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-dyn-mod"; @Override public List> getComponents() { return Arrays.asList( Component.builder(DynamicLoadingSupport.class) + .name(LIBRARY_NAME) .add(Dependency.required(Context.class)) .add(Dependency.required(ComponentLoader.class)) .alwaysEager() @@ -36,6 +38,6 @@ public List> getComponents() { new DynamicLoadingSupport( container.get(Context.class), container.get(ComponentLoader.class))) .build(), - LibraryVersionComponent.create("fire-dyn-mod", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigRegistrar.java b/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigRegistrar.java index 3051c4a9c27..d856c9d573d 100644 --- a/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigRegistrar.java +++ b/firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigRegistrar.java @@ -37,10 +37,13 @@ */ @Keep public class RemoteConfigRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-rc"; + @Override public List> getComponents() { return Arrays.asList( Component.builder(RemoteConfigComponent.class) + .name(LIBRARY_NAME) .add(Dependency.required(Context.class)) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.required(FirebaseInstallationsApi.class)) @@ -56,6 +59,6 @@ public List> getComponents() { container.getProvider(AnalyticsConnector.class))) .eagerInDefaultApp() .build(), - LibraryVersionComponent.create("fire-rc", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashlyticsNdkRegistrar.java b/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashlyticsNdkRegistrar.java index 5d3f6eb5821..05a75f065f7 100644 --- a/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashlyticsNdkRegistrar.java +++ b/firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashlyticsNdkRegistrar.java @@ -26,15 +26,18 @@ import java.util.List; public class CrashlyticsNdkRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-cls-ndk"; + @Override public List> getComponents() { return Arrays.asList( Component.builder(CrashlyticsNativeComponent.class) + .name(LIBRARY_NAME) .add(Dependency.required(Context.class)) .factory(this::buildCrashlyticsNdk) .eagerInDefaultApp() .build(), - LibraryVersionComponent.create("fire-cls-ndk", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } private CrashlyticsNativeComponent buildCrashlyticsNdk(ComponentContainer container) { diff --git a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java index 49b2391f94e..b18d4f25750 100644 --- a/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java +++ b/firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java @@ -29,10 +29,13 @@ /** @hide */ public class CrashlyticsRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-cls"; + @Override public List> getComponents() { return Arrays.asList( Component.builder(FirebaseCrashlytics.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.required(FirebaseInstallationsApi.class)) .add(Dependency.deferred(CrashlyticsNativeComponent.class)) @@ -40,7 +43,7 @@ public List> getComponents() { .factory(this::buildCrashlytics) .eagerInDefaultApp() .build(), - LibraryVersionComponent.create("fire-cls", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } private FirebaseCrashlytics buildCrashlytics(ComponentContainer container) { diff --git a/firebase-database/src/main/java/com/google/firebase/database/DatabaseRegistrar.java b/firebase-database/src/main/java/com/google/firebase/database/DatabaseRegistrar.java index 7827118aa1c..1ddbf3ae9df 100644 --- a/firebase-database/src/main/java/com/google/firebase/database/DatabaseRegistrar.java +++ b/firebase-database/src/main/java/com/google/firebase/database/DatabaseRegistrar.java @@ -30,10 +30,13 @@ @Keep @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) public class DatabaseRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-rtdb"; + @Override public List> getComponents() { return Arrays.asList( Component.builder(FirebaseDatabaseComponent.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.deferred(InternalAuthProvider.class)) .add(Dependency.deferred(InternalAppCheckTokenProvider.class)) @@ -44,6 +47,6 @@ public List> getComponents() { c.getDeferred(InternalAuthProvider.class), c.getDeferred(InternalAppCheckTokenProvider.class))) .build(), - LibraryVersionComponent.create("fire-rtdb", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportRegistrar.java b/firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportRegistrar.java index 7972b411148..dd92eb0ffab 100644 --- a/firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportRegistrar.java +++ b/firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportRegistrar.java @@ -28,10 +28,13 @@ @Keep public class TransportRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-transport"; + @Override public List> getComponents() { return Arrays.asList( Component.builder(TransportFactory.class) + .name(LIBRARY_NAME) .add(Dependency.required(Context.class)) .factory( c -> { @@ -39,6 +42,6 @@ public List> getComponents() { return TransportRuntime.getInstance().newFactory(CCTDestination.LEGACY_INSTANCE); }) .build(), - LibraryVersionComponent.create("fire-transport", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.java b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.java index c88adb9c821..d63fdce1b53 100644 --- a/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.java +++ b/firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.java @@ -37,12 +37,14 @@ @KeepForSdk @Keep public final class FirebaseDynamicLinkRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-dl"; @Override @Keep public List> getComponents() { Component firebaseDynamicLinks = Component.builder(FirebaseDynamicLinks.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.optionalProvider(AnalyticsConnector.class)) .factory( @@ -53,6 +55,7 @@ public List> getComponents() { .build(); // no need for eager init for the Internal component. return Arrays.asList( - firebaseDynamicLinks, LibraryVersionComponent.create("fire-dl", BuildConfig.VERSION_NAME)); + firebaseDynamicLinks, + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreRegistrar.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreRegistrar.java index 7d7b9d12e1c..2d91eeba828 100644 --- a/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreRegistrar.java +++ b/firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreRegistrar.java @@ -39,11 +39,14 @@ @Keep @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) public class FirestoreRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-fst"; + @Override @Keep public List> getComponents() { return Arrays.asList( Component.builder(FirestoreMultiDbComponent.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.required(Context.class)) .add(Dependency.optionalProvider(HeartBeatInfo.class)) @@ -63,6 +66,6 @@ public List> getComponents() { c.getProvider(HeartBeatInfo.class), c.get(FirebaseOptions.class)))) .build(), - LibraryVersionComponent.create("fire-fst", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsRegistrar.java b/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsRegistrar.java index 4a36d4ee6c9..9a1033721fb 100644 --- a/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsRegistrar.java +++ b/firebase-functions/src/main/java/com/google/firebase/functions/FunctionsRegistrar.java @@ -34,6 +34,8 @@ */ @Keep public class FunctionsRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-fn"; + @Override public List> getComponents() { return Arrays.asList( @@ -49,6 +51,7 @@ public List> getComponents() { c.getDeferred(InternalAppCheckTokenProvider.class))) .build(), Component.builder(FunctionsMultiResourceComponent.class) + .name(LIBRARY_NAME) .add(Dependency.required(Context.class)) .add(Dependency.required(ContextProvider.class)) .add(Dependency.required(FirebaseApp.class)) @@ -59,6 +62,6 @@ public List> getComponents() { c.get(ContextProvider.class), c.get(FirebaseApp.class))) .build(), - LibraryVersionComponent.create("fire-fn", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayRegistrar.java b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayRegistrar.java index afae9afa942..68658e69c38 100644 --- a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayRegistrar.java +++ b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayRegistrar.java @@ -39,17 +39,20 @@ */ @Keep public class FirebaseInAppMessagingDisplayRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-fiamd"; + @Override @Keep public List> getComponents() { return Arrays.asList( Component.builder(FirebaseInAppMessagingDisplay.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.required(FirebaseInAppMessaging.class)) .factory(this::buildFirebaseInAppMessagingUI) .eagerInDefaultApp() .build(), - LibraryVersionComponent.create("fire-fiamd", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } private FirebaseInAppMessagingDisplay buildFirebaseInAppMessagingUI( diff --git a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java index 763004d4829..2fe096f8fe6 100644 --- a/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java +++ b/firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java @@ -52,11 +52,14 @@ */ @Keep public class FirebaseInAppMessagingRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-fiam"; + @Override @Keep public List> getComponents() { return Arrays.asList( Component.builder(FirebaseInAppMessaging.class) + .name(LIBRARY_NAME) .add(Dependency.required(Context.class)) .add(Dependency.required(FirebaseInstallationsApi.class)) .add(Dependency.required(FirebaseApp.class)) @@ -67,7 +70,7 @@ public List> getComponents() { .factory(this::providesFirebaseInAppMessaging) .eagerInDefaultApp() .build(), - LibraryVersionComponent.create("fire-fiam", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } private FirebaseInAppMessaging providesFirebaseInAppMessaging(ComponentContainer container) { diff --git a/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallationsRegistrar.java b/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallationsRegistrar.java index f50186beeea..901375a1105 100644 --- a/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallationsRegistrar.java +++ b/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallationsRegistrar.java @@ -28,11 +28,13 @@ /** @hide */ @Keep public class FirebaseInstallationsRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-installations"; @Override public List> getComponents() { return Arrays.asList( Component.builder(FirebaseInstallationsApi.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.optionalProvider(HeartBeatController.class)) .factory( @@ -41,6 +43,6 @@ public List> getComponents() { c.get(FirebaseApp.class), c.getProvider(HeartBeatController.class))) .build(), HeartBeatConsumerComponent.create(), - LibraryVersionComponent.create("fire-installations", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingRegistrar.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingRegistrar.java index bf4e94fd246..f2941fd59e4 100644 --- a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingRegistrar.java +++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingRegistrar.java @@ -38,11 +38,14 @@ @KeepForSdk @Keep public class FirebaseMessagingRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-fcm"; + @Override @Keep public List> getComponents() { return Arrays.asList( Component.builder(FirebaseMessaging.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.optional(FirebaseInstanceIdInternal.class)) .add(Dependency.optionalProvider(UserAgentPublisher.class)) @@ -62,6 +65,6 @@ public List> getComponents() { container.get(Subscriber.class))) .alwaysEager() .build(), - LibraryVersionComponent.create("fire-fcm", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderRegistrar.java b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderRegistrar.java index b9b133505ab..cb92e0950ac 100644 --- a/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderRegistrar.java +++ b/firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloaderRegistrar.java @@ -39,6 +39,7 @@ * @hide */ public class FirebaseModelDownloaderRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "firebase-ml-modeldownloader"; @Override @NonNull @@ -46,6 +47,7 @@ public class FirebaseModelDownloaderRegistrar implements ComponentRegistrar { public List> getComponents() { return Arrays.asList( Component.builder(FirebaseModelDownloader.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.required(FirebaseInstallationsApi.class)) .factory( @@ -84,6 +86,6 @@ public List> getComponents() { new CustomModelDownloadService( c.get(FirebaseApp.class), c.get(FirebaseInstallationsApi.class))) .build(), - LibraryVersionComponent.create("firebase-ml-modeldownloader", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfRegistrar.java b/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfRegistrar.java index ef96888fd68..3dc56578866 100644 --- a/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfRegistrar.java +++ b/firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfRegistrar.java @@ -40,12 +40,14 @@ */ @Keep public class FirebasePerfRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-perf"; @Override @Keep public List> getComponents() { return Arrays.asList( Component.builder(FirebasePerformance.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.requiredProvider(RemoteConfigComponent.class)) .add(Dependency.required(FirebaseInstallationsApi.class)) @@ -59,7 +61,7 @@ public List> getComponents() { * not to force initialize them at app startup (refer * https://github.com/google/guice/wiki/InjectingProviders#providers-for-lazy-loading)* */ - LibraryVersionComponent.create("fire-perf", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } private static FirebasePerformance providesFirebasePerformance(ComponentContainer container) { diff --git a/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentationRegistrar.java b/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentationRegistrar.java index c69385a9cba..d005b206677 100644 --- a/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentationRegistrar.java +++ b/firebase-segmentation/src/main/java/com/google/firebase/segmentation/FirebaseSegmentationRegistrar.java @@ -26,12 +26,14 @@ /** @hide */ public class FirebaseSegmentationRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-segmentation"; @Override @NonNull public List> getComponents() { return Arrays.asList( Component.builder(FirebaseSegmentation.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.required(FirebaseInstallationsApi.class)) .factory( @@ -39,6 +41,6 @@ public List> getComponents() { new FirebaseSegmentation( c.get(FirebaseApp.class), c.get(FirebaseInstallationsApi.class))) .build(), - LibraryVersionComponent.create("fire-segmentation", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } } diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/StorageRegistrar.java b/firebase-storage/src/main/java/com/google/firebase/storage/StorageRegistrar.java index 57ebbdd5d17..b3e773be2c4 100644 --- a/firebase-storage/src/main/java/com/google/firebase/storage/StorageRegistrar.java +++ b/firebase-storage/src/main/java/com/google/firebase/storage/StorageRegistrar.java @@ -30,10 +30,13 @@ @Keep @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) public class StorageRegistrar implements ComponentRegistrar { + private static final String LIBRARY_NAME = "fire-gcs"; + @Override public List> getComponents() { return Arrays.asList( Component.builder(FirebaseStorageComponent.class) + .name(LIBRARY_NAME) .add(Dependency.required(FirebaseApp.class)) .add(Dependency.optionalProvider(InternalAuthProvider.class)) .add(Dependency.optionalProvider(InternalAppCheckTokenProvider.class)) @@ -44,6 +47,6 @@ public List> getComponents() { c.getProvider(InternalAuthProvider.class), c.getProvider(InternalAppCheckTokenProvider.class))) .build(), - LibraryVersionComponent.create("fire-gcs", BuildConfig.VERSION_NAME)); + LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME)); } }