Merge a5966d2 into 6caf590

yifanyang · web-flow · commit 49e124974e12 · 2022-09-21T20:12:41.000Z
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
@@ -29,10 +29,10 @@
  */
 @KeepForSdk
 public class FirebaseAppCheckDebugRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-app-check-debug";
 
   @Override
   public List<Component<?>> 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
@@ -29,10 +29,10 @@
  */
 @KeepForSdk
 public class FirebaseAppCheckPlayIntegrityRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-app-check-play-integrity";
 
   @Override
   public List<Component<?>> 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
@@ -29,10 +29,10 @@
  */
 @KeepForSdk
 public class FirebaseAppCheckSafetyNetRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-app-check-safety-net";
 
   @Override
   public List<Component<?>> 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
@@ -35,11 +35,13 @@
  */
 @KeepForSdk
 public class FirebaseAppCheckRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-app-check";
 
   @Override
   public List<Component<?>> 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<Component<?>> 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
@@ -32,11 +32,13 @@
  */
 @Keep
 public class AbtRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-abt";
 
   @Override
   public List<Component<?>> 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<Component<?>> 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
@@ -32,18 +32,20 @@
  */
 @Keep
 public class FirebaseAppDistributionApiRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-appdistribution-api";
 
   @Override
   public @NonNull List<Component<?>> 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
@@ -37,21 +37,23 @@
  */
 @Keep
 public class FirebaseAppDistributionRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-appdistribution";
 
   private static String TAG = "Registrar:";
 
   @Override
   public @NonNull List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirebaseAppDistribution.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.requiredProvider(FirebaseInstallationsApi.class))
             .factory(this::buildFirebaseAppDistribution)
             // construct FirebaseAppDistribution instance on startup so we can register for
             // 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
@@ -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<Component<?>> 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<Component<?>> 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
@@ -37,10 +37,13 @@
  */
 @Keep
 public class RemoteConfigRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-rc";
+
   @Override
   public List<Component<?>> 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<Component<?>> 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
@@ -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<Component<?>> 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
@@ -29,18 +29,21 @@
 
 /** @hide */
 public class CrashlyticsRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-cls";
+
   @Override
   public List<Component<?>> 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))
             .add(Dependency.deferred(AnalyticsConnector.class))
             .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
@@ -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<Component<?>> 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<Component<?>> 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
@@ -28,17 +28,20 @@
 
 @Keep
 public class TransportRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-transport";
+
   @Override
   public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(TransportFactory.class)
+            .name(LIBRARY_NAME)
             .add(Dependency.required(Context.class))
             .factory(
                 c -> {
                   TransportRuntime.initialize(c.get(Context.class));
                   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
@@ -37,12 +37,14 @@
 @KeepForSdk
 @Keep
 public final class FirebaseDynamicLinkRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-dl";
 
   @Override
   @Keep
   public List<Component<?>> getComponents() {
     Component<FirebaseDynamicLinks> 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<Component<?>> 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
@@ -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<Component<?>> 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<Component<?>> 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
@@ -34,6 +34,8 @@
  */
 @Keep
 public class FunctionsRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-fn";
+
   @Override
   public List<Component<?>> getComponents() {
     return Arrays.asList(
@@ -49,6 +51,7 @@ public List<Component<?>> 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<Component<?>> 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
@@ -39,17 +39,20 @@
  */
 @Keep
 public class FirebaseInAppMessagingDisplayRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-fiamd";
+
   @Override
   @Keep
   public List<Component<?>> 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
@@ -52,11 +52,14 @@
  */
 @Keep
 public class FirebaseInAppMessagingRegistrar implements ComponentRegistrar {
+  private static final String LIBRARY_NAME = "fire-fiam";
+
   @Override
   @Keep
   public List<Component<?>> 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<Component<?>> 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
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
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
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
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
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

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@`
`29`	`29`	`*/`
`30`	`30`	`@KeepForSdk`
`31`	`31`	`public class FirebaseAppCheckDebugRegistrar implements ComponentRegistrar {`
	`32`	`+ private static final String LIBRARY_NAME = "fire-app-check-debug";`
`32`	`33`
`33`	`34`	`@Override`
`34`	`35`	`public List<Component<?>> getComponents() {`
`35`		`- return Arrays.asList(`
`36`		`- LibraryVersionComponent.create("fire-app-check-debug", BuildConfig.VERSION_NAME));`
	`36`	`+ return Arrays.asList(LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));`
`37`	`37`	`}`
`38`	`38`	`}`