Skip to content

Commit c2fb84f

Browse files
yifanyangyifanyang
committed
Extract library name to a constant
1 parent 77b2834 commit c2fb84f

File tree

21 files changed

+74
-42
lines changed

21 files changed

+74
-42
lines changed

‎appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@
3535
*/
3636
@KeepForSdk
3737
public class FirebaseAppCheckRegistrar implements ComponentRegistrar {
38+
public static final String LIBRARY_NAME = "fire-app-check";
3839

3940
@Override
4041
public List<Component<?>> getComponents() {
4142
return Arrays.asList(
4243
Component.builder(FirebaseAppCheck.class, (InternalAppCheckTokenProvider.class))
43-
.name("fire-app-check")
44+
.name(LIBRARY_NAME)
4445
.add(Dependency.required(FirebaseApp.class))
4546
.add(Dependency.optionalProvider(HeartBeatController.class))
4647
.factory(
@@ -51,6 +52,6 @@ public List<Component<?>> getComponents() {
5152
.alwaysEager()
5253
.build(),
5354
HeartBeatConsumerComponent.create(),
54-
LibraryVersionComponent.create("fire-app-check", BuildConfig.VERSION_NAME));
55+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
5556
}
5657
}

‎firebase-abt/src/main/java/com/google/firebase/abt/component/AbtRegistrar.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@
3232
*/
3333
@Keep
3434
public class AbtRegistrar implements ComponentRegistrar {
35+
public static final String LIBRARY_NAME = "fire-abt";
3536

3637
@Override
3738
public List<Component<?>> getComponents() {
3839
return Arrays.asList(
3940
Component.builder(AbtComponent.class)
40-
.name("fire-abt")
41+
.name(LIBRARY_NAME)
4142
.add(Dependency.required(Context.class))
4243
.add(Dependency.optionalProvider(AnalyticsConnector.class))
4344
.factory(
@@ -46,6 +47,6 @@ public List<Component<?>> getComponents() {
4647
container.get(Context.class),
4748
container.getProvider(AnalyticsConnector.class)))
4849
.build(),
49-
LibraryVersionComponent.create("fire-abt", BuildConfig.VERSION_NAME));
50+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
5051
}
5152
}

‎firebase-appdistribution-api/src/main/java/com/google/firebase/appdistribution/FirebaseAppDistributionApiRegistrar.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,20 @@
3232
*/
3333
@Keep
3434
public class FirebaseAppDistributionApiRegistrar implements ComponentRegistrar {
35+
public static final String LIBRARY_NAME = "fire-appdistribution-api";
3536

3637
@Override
3738
public @NonNull List<Component<?>> getComponents() {
3839
return Arrays.asList(
3940
Component.builder(FirebaseAppDistributionProxy.class)
40-
.name("fire-appdistribution-api")
41+
.name(LIBRARY_NAME)
4142
.add(Dependency.optionalProvider(FirebaseAppDistribution.class))
4243
.factory(this::buildFirebaseAppDistributionProxy)
4344
// construct FirebaseAppDistribution instance on startup so we can register for
4445
// activity lifecycle callbacks before the API is called
4546
.alwaysEager()
4647
.build(),
47-
LibraryVersionComponent.create("fire-appdistribution-api", BuildConfig.VERSION_NAME));
48+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
4849
}
4950

5051
private FirebaseAppDistributionProxy buildFirebaseAppDistributionProxy(

‎firebase-appdistribution/src/main/java/com/google/firebase/appdistribution/impl/FirebaseAppDistributionRegistrar.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,23 @@
3737
*/
3838
@Keep
3939
public class FirebaseAppDistributionRegistrar implements ComponentRegistrar {
40+
public static final String LIBRARY_NAME = "fire-appdistribution";
4041

4142
private static String TAG = "Registrar:";
4243

4344
@Override
4445
public @NonNull List<Component<?>> getComponents() {
4546
return Arrays.asList(
4647
Component.builder(FirebaseAppDistribution.class)
47-
.name("fire-appdistribution")
48+
.name(LIBRARY_NAME)
4849
.add(Dependency.required(FirebaseApp.class))
4950
.add(Dependency.requiredProvider(FirebaseInstallationsApi.class))
5051
.factory(this::buildFirebaseAppDistribution)
5152
// construct FirebaseAppDistribution instance on startup so we can register for
5253
// activity lifecycle callbacks before the API is called
5354
.alwaysEager()
5455
.build(),
55-
LibraryVersionComponent.create("fire-appdistribution", BuildConfig.VERSION_NAME));
56+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
5657
}
5758

5859
private FirebaseAppDistribution buildFirebaseAppDistribution(ComponentContainer container) {

‎firebase-components/firebase-dynamic-module-support/src/main/java/com/google/firebase/dynamicloading/DynamicLoadingRegistrar.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@
2323
import java.util.List;
2424

2525
public class DynamicLoadingRegistrar implements ComponentRegistrar {
26+
public static final String LIBRARY_NAME = "fire-dyn-mod";
2627

2728
@Override
2829
public List<Component<?>> getComponents() {
2930
return Arrays.asList(
3031
Component.builder(DynamicLoadingSupport.class)
31-
.name("fire-dyn-mod")
32+
.name(LIBRARY_NAME)
3233
.add(Dependency.required(Context.class))
3334
.add(Dependency.required(ComponentLoader.class))
3435
.alwaysEager()
@@ -37,6 +38,6 @@ public List<Component<?>> getComponents() {
3738
new DynamicLoadingSupport(
3839
container.get(Context.class), container.get(ComponentLoader.class)))
3940
.build(),
40-
LibraryVersionComponent.create("fire-dyn-mod", BuildConfig.VERSION_NAME));
41+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
4142
}
4243
}

‎firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigRegistrar.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,13 @@
3737
*/
3838
@Keep
3939
public class RemoteConfigRegistrar implements ComponentRegistrar {
40+
public static final String LIBRARY_NAME = "fire-rc";
41+
4042
@Override
4143
public List<Component<?>> getComponents() {
4244
return Arrays.asList(
4345
Component.builder(RemoteConfigComponent.class)
44-
.name("fire-rc")
46+
.name(LIBRARY_NAME)
4547
.add(Dependency.required(Context.class))
4648
.add(Dependency.required(FirebaseApp.class))
4749
.add(Dependency.required(FirebaseInstallationsApi.class))
@@ -57,6 +59,6 @@ public List<Component<?>> getComponents() {
5759
container.getProvider(AnalyticsConnector.class)))
5860
.eagerInDefaultApp()
5961
.build(),
60-
LibraryVersionComponent.create("fire-rc", BuildConfig.VERSION_NAME));
62+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
6163
}
6264
}

‎firebase-crashlytics-ndk/src/main/java/com/google/firebase/crashlytics/ndk/CrashlyticsNdkRegistrar.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,18 @@
2626
import java.util.List;
2727

2828
public class CrashlyticsNdkRegistrar implements ComponentRegistrar {
29+
public static final String LIBRARY_NAME = "fire-cls-ndk";
30+
2931
@Override
3032
public List<Component<?>> getComponents() {
3133
return Arrays.asList(
3234
Component.builder(CrashlyticsNativeComponent.class)
33-
.name("fire-cls-ndk")
35+
.name(LIBRARY_NAME)
3436
.add(Dependency.required(Context.class))
3537
.factory(this::buildCrashlyticsNdk)
3638
.eagerInDefaultApp()
3739
.build(),
38-
LibraryVersionComponent.create("fire-cls-ndk", BuildConfig.VERSION_NAME));
40+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
3941
}
4042

4143
private CrashlyticsNativeComponent buildCrashlyticsNdk(ComponentContainer container) {

‎firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,21 @@
2929

3030
/** @hide */
3131
public class CrashlyticsRegistrar implements ComponentRegistrar {
32+
public static final String LIBRARY_NAME = "fire-cls";
33+
3234
@Override
3335
public List<Component<?>> getComponents() {
3436
return Arrays.asList(
3537
Component.builder(FirebaseCrashlytics.class)
36-
.name("fire-cls")
38+
.name(LIBRARY_NAME)
3739
.add(Dependency.required(FirebaseApp.class))
3840
.add(Dependency.required(FirebaseInstallationsApi.class))
3941
.add(Dependency.deferred(CrashlyticsNativeComponent.class))
4042
.add(Dependency.deferred(AnalyticsConnector.class))
4143
.factory(this::buildCrashlytics)
4244
.eagerInDefaultApp()
4345
.build(),
44-
LibraryVersionComponent.create("fire-cls", BuildConfig.VERSION_NAME));
46+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
4547
}
4648

4749
private FirebaseCrashlytics buildCrashlytics(ComponentContainer container) {

‎firebase-database/src/main/java/com/google/firebase/database/DatabaseRegistrar.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@
3030
@Keep
3131
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
3232
public class DatabaseRegistrar implements ComponentRegistrar {
33+
public static final String LIBRARY_NAME = "fire-rtdb";
34+
3335
@Override
3436
public List<Component<?>> getComponents() {
3537
return Arrays.asList(
3638
Component.builder(FirebaseDatabaseComponent.class)
37-
.name("fire-rtdb")
39+
.name(LIBRARY_NAME)
3840
.add(Dependency.required(FirebaseApp.class))
3941
.add(Dependency.deferred(InternalAuthProvider.class))
4042
.add(Dependency.deferred(InternalAppCheckTokenProvider.class))
@@ -45,6 +47,6 @@ public List<Component<?>> getComponents() {
4547
c.getDeferred(InternalAuthProvider.class),
4648
c.getDeferred(InternalAppCheckTokenProvider.class)))
4749
.build(),
48-
LibraryVersionComponent.create("fire-rtdb", BuildConfig.VERSION_NAME));
50+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
4951
}
5052
}

‎firebase-datatransport/src/main/java/com/google/firebase/datatransport/TransportRegistrar.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,20 @@
2828

2929
@Keep
3030
public class TransportRegistrar implements ComponentRegistrar {
31+
public static final String LIBRARY_NAME = "fire-transport";
32+
3133
@Override
3234
public List<Component<?>> getComponents() {
3335
return Arrays.asList(
3436
Component.builder(TransportFactory.class)
35-
.name("fire-transport")
37+
.name(LIBRARY_NAME)
3638
.add(Dependency.required(Context.class))
3739
.factory(
3840
c -> {
3941
TransportRuntime.initialize(c.get(Context.class));
4042
return TransportRuntime.getInstance().newFactory(CCTDestination.LEGACY_INSTANCE);
4143
})
4244
.build(),
43-
LibraryVersionComponent.create("fire-transport", BuildConfig.VERSION_NAME));
45+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
4446
}
4547
}

‎firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,14 @@
3737
@KeepForSdk
3838
@Keep
3939
public final class FirebaseDynamicLinkRegistrar implements ComponentRegistrar {
40+
public static final String LIBRARY_NAME = "fire-dl";
4041

4142
@Override
4243
@Keep
4344
public List<Component<?>> getComponents() {
4445
Component<FirebaseDynamicLinks> firebaseDynamicLinks =
4546
Component.builder(FirebaseDynamicLinks.class)
46-
.name("fire-dl")
47+
.name(LIBRARY_NAME)
4748
.add(Dependency.required(FirebaseApp.class))
4849
.add(Dependency.optionalProvider(AnalyticsConnector.class))
4950
.factory(
@@ -54,6 +55,6 @@ public List<Component<?>> getComponents() {
5455
.build(); // no need for eager init for the Internal component.
5556

5657
return Arrays.asList(
57-
firebaseDynamicLinks, LibraryVersionComponent.create("fire-dl", BuildConfig.VERSION_NAME));
58+
firebaseDynamicLinks, LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
5859
}
5960
}

‎firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreRegistrar.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@
3939
@Keep
4040
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
4141
public class FirestoreRegistrar implements ComponentRegistrar {
42+
public static final String LIBRARY_NAME = "fire-fst";
43+
4244
@Override
4345
@Keep
4446
public List<Component<?>> getComponents() {
4547
return Arrays.asList(
4648
Component.builder(FirestoreMultiDbComponent.class)
47-
.name("fire-fst")
49+
.name(LIBRARY_NAME)
4850
.add(Dependency.required(FirebaseApp.class))
4951
.add(Dependency.required(Context.class))
5052
.add(Dependency.optionalProvider(HeartBeatInfo.class))
@@ -64,6 +66,6 @@ public List<Component<?>> getComponents() {
6466
c.getProvider(HeartBeatInfo.class),
6567
c.get(FirebaseOptions.class))))
6668
.build(),
67-
LibraryVersionComponent.create("fire-fst", BuildConfig.VERSION_NAME));
69+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
6870
}
6971
}

‎firebase-functions/src/main/java/com/google/firebase/functions/FunctionsRegistrar.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
*/
3535
@Keep
3636
public class FunctionsRegistrar implements ComponentRegistrar {
37+
public static final String LIBRARY_NAME = "fire-fn";
38+
3739
@Override
3840
public List<Component<?>> getComponents() {
3941
return Arrays.asList(
@@ -49,7 +51,7 @@ public List<Component<?>> getComponents() {
4951
c.getDeferred(InternalAppCheckTokenProvider.class)))
5052
.build(),
5153
Component.builder(FunctionsMultiResourceComponent.class)
52-
.name("fire-fn")
54+
.name(LIBRARY_NAME)
5355
.add(Dependency.required(Context.class))
5456
.add(Dependency.required(ContextProvider.class))
5557
.add(Dependency.required(FirebaseApp.class))
@@ -60,6 +62,6 @@ public List<Component<?>> getComponents() {
6062
c.get(ContextProvider.class),
6163
c.get(FirebaseApp.class)))
6264
.build(),
63-
LibraryVersionComponent.create("fire-fn", BuildConfig.VERSION_NAME));
65+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
6466
}
6567
}

‎firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplayRegistrar.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,20 @@
3939
*/
4040
@Keep
4141
public class FirebaseInAppMessagingDisplayRegistrar implements ComponentRegistrar {
42+
public static final String LIBRARY_NAME = "fire-fiamd";
43+
4244
@Override
4345
@Keep
4446
public List<Component<?>> getComponents() {
4547
return Arrays.asList(
4648
Component.builder(FirebaseInAppMessagingDisplay.class)
47-
.name("fire-fiamd")
49+
.name(LIBRARY_NAME)
4850
.add(Dependency.required(FirebaseApp.class))
4951
.add(Dependency.required(FirebaseInAppMessaging.class))
5052
.factory(this::buildFirebaseInAppMessagingUI)
5153
.eagerInDefaultApp()
5254
.build(),
53-
LibraryVersionComponent.create("fire-fiamd", BuildConfig.VERSION_NAME));
55+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
5456
}
5557

5658
private FirebaseInAppMessagingDisplay buildFirebaseInAppMessagingUI(

‎firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingRegistrar.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,14 @@
5252
*/
5353
@Keep
5454
public class FirebaseInAppMessagingRegistrar implements ComponentRegistrar {
55+
public static final String LIBRARY_NAME = "fire-fiam";
56+
5557
@Override
5658
@Keep
5759
public List<Component<?>> getComponents() {
5860
return Arrays.asList(
5961
Component.builder(FirebaseInAppMessaging.class)
60-
.name("fire-fiam")
62+
.name(LIBRARY_NAME)
6163
.add(Dependency.required(Context.class))
6264
.add(Dependency.required(FirebaseInstallationsApi.class))
6365
.add(Dependency.required(FirebaseApp.class))
@@ -68,7 +70,7 @@ public List<Component<?>> getComponents() {
6870
.factory(this::providesFirebaseInAppMessaging)
6971
.eagerInDefaultApp()
7072
.build(),
71-
LibraryVersionComponent.create("fire-fiam", BuildConfig.VERSION_NAME));
73+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
7274
}
7375

7476
private FirebaseInAppMessaging providesFirebaseInAppMessaging(ComponentContainer container) {

‎firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallationsRegistrar.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@
2828
/** @hide */
2929
@Keep
3030
public class FirebaseInstallationsRegistrar implements ComponentRegistrar {
31+
public static final String LIBRARY_NAME = "fire-installations";
3132

3233
@Override
3334
public List<Component<?>> getComponents() {
3435
return Arrays.asList(
3536
Component.builder(FirebaseInstallationsApi.class)
36-
.name("fire-installations")
37+
.name(LIBRARY_NAME)
3738
.add(Dependency.required(FirebaseApp.class))
3839
.add(Dependency.optionalProvider(HeartBeatController.class))
3940
.factory(
@@ -42,6 +43,6 @@ public List<Component<?>> getComponents() {
4243
c.get(FirebaseApp.class), c.getProvider(HeartBeatController.class)))
4344
.build(),
4445
HeartBeatConsumerComponent.create(),
45-
LibraryVersionComponent.create("fire-installations", BuildConfig.VERSION_NAME));
46+
LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
4647
}
4748
}

0 commit comments

Comments
 (0)