Skip to content

Commit 2d3b2be

Browse files
authored
[FIAM] Firelog to clearcut migration (#5245)
[FIAM] Firelog to clearcut migration
1 parent aa00993 commit 2d3b2be

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

firebase-inappmessaging-display/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Unreleased
2+
* [changed] Firelog to clearcut migration.
23

34
# 20.3.3
45
* [unchanged] Updated internal Dagger dependency.

firebase-inappmessaging/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Unreleased
2+
* [changed] Firelog to clearcut migration.
23

34
# 20.3.3
45
* [unchanged] Updated internal Dagger dependency.

firebase-inappmessaging/firebase-inappmessaging.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ dependencies {
106106
implementation 'com.google.firebase:firebase-components:17.1.0'
107107
implementation project(':protolite-well-known-types')
108108
implementation 'com.google.android.datatransport:transport-api:3.0.0'
109-
implementation 'com.google.firebase:firebase-datatransport:18.1.7'
109+
implementation project(':firebase-datatransport')
110110
implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
111111
runtimeOnly project(':firebase-installations')
112112
implementation 'javax.inject:javax.inject:1'

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.google.firebase.components.ComponentRegistrar;
3131
import com.google.firebase.components.Dependency;
3232
import com.google.firebase.components.Qualified;
33+
import com.google.firebase.datatransport.LegacyTransportBackend;
3334
import com.google.firebase.events.Subscriber;
3435
import com.google.firebase.inappmessaging.internal.AbtIntegrationHelper;
3536
import com.google.firebase.inappmessaging.internal.ProgramaticContextualTriggers;
@@ -66,6 +67,9 @@ public class FirebaseInAppMessagingRegistrar implements ComponentRegistrar {
6667
private Qualified<Executor> lightWeightExecutor =
6768
Qualified.qualified(Lightweight.class, Executor.class);
6869

70+
private Qualified<TransportFactory> legacyTransportFactory =
71+
Qualified.qualified(LegacyTransportBackend.class, TransportFactory.class);
72+
6973
@Override
7074
@Keep
7175
public List<Component<?>> getComponents() {
@@ -77,7 +81,7 @@ public List<Component<?>> getComponents() {
7781
.add(Dependency.required(FirebaseApp.class))
7882
.add(Dependency.required(AbtComponent.class))
7983
.add(Dependency.deferred(AnalyticsConnector.class))
80-
.add(Dependency.required(TransportFactory.class))
84+
.add(Dependency.required(legacyTransportFactory))
8185
.add(Dependency.required(Subscriber.class))
8286
.add(Dependency.required(backgroundExecutor))
8387
.add(Dependency.required(blockingExecutor))
@@ -125,7 +129,7 @@ private FirebaseInAppMessaging providesFirebaseInAppMessaging(ComponentContainer
125129
new ApiClientModule(firebaseApp, firebaseInstallations, universalComponent.clock()))
126130
.grpcClientModule(new GrpcClientModule(firebaseApp))
127131
.universalComponent(universalComponent)
128-
.transportFactory(container.get(TransportFactory.class))
132+
.transportFactory(container.get(legacyTransportFactory))
129133
.build();
130134

131135
return instance.providesFirebaseInAppMessaging();

0 commit comments

Comments
 (0)