From 9f268136972ed502f6a443323075ae773834efb5 Mon Sep 17 00:00:00 2001 From: rosariopf Date: Tue, 31 Oct 2023 21:26:53 +0000 Subject: [PATCH] upgrade to Firebase BoM 32.5.0 and drop Firebase KTX --- .../apps/nowinandroid/core/analytics/AnalyticsModule.kt | 4 ++-- gradle/libs.versions.toml | 8 ++++---- .../samples/apps/nowinandroid/sync/di/SyncModule.kt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt b/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt index 9f875ae6d..a2a1d1fad 100644 --- a/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt +++ b/core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt @@ -17,8 +17,8 @@ package com.google.samples.apps.nowinandroid.core.analytics import com.google.firebase.analytics.FirebaseAnalytics -import com.google.firebase.analytics.ktx.analytics -import com.google.firebase.ktx.Firebase +import com.google.firebase.analytics.analytics +import com.google.firebase.Firebase import dagger.Binds import dagger.Module import dagger.Provides diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 60d827c0e..516c4b30d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,7 +28,7 @@ androidxUiAutomator = "2.2.0" androidxWindowManager = "1.1.0" androidxWork = "2.9.0-beta01" coil = "2.4.0" -firebaseBom = "32.3.1" +firebaseBom = "32.5.0" firebaseCrashlyticsPlugin = "2.9.9" firebasePerfPlugin = "1.4.2" gmsPlugin = "4.4.0" @@ -103,9 +103,9 @@ coil-kt-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = " coil-kt-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil" } firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx" } firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" } -firebase-cloud-messaging = { group = "com.google.firebase", name = "firebase-messaging-ktx" } -firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics-ktx" } -firebase-performance = { group = "com.google.firebase", name = "firebase-perf-ktx" } +firebase-cloud-messaging = { group = "com.google.firebase", name = "firebase-messaging" } +firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" } +firebase-performance = { group = "com.google.firebase", name = "firebase-perf" } firebase-performance-gradle = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" } google-oss-licenses = { group = "com.google.android.gms", name = "play-services-oss-licenses", version.ref = "googleOss" } google-oss-licenses-plugin = { group = "com.google.android.gms", name = "oss-licenses-plugin", version.ref = "googleOssPlugin" } diff --git a/sync/work/src/prod/kotlin/com/google/samples/apps/nowinandroid/sync/di/SyncModule.kt b/sync/work/src/prod/kotlin/com/google/samples/apps/nowinandroid/sync/di/SyncModule.kt index af4508406..9a69a3c78 100644 --- a/sync/work/src/prod/kotlin/com/google/samples/apps/nowinandroid/sync/di/SyncModule.kt +++ b/sync/work/src/prod/kotlin/com/google/samples/apps/nowinandroid/sync/di/SyncModule.kt @@ -16,9 +16,9 @@ package com.google.samples.apps.nowinandroid.sync.di -import com.google.firebase.ktx.Firebase +import com.google.firebase.Firebase import com.google.firebase.messaging.FirebaseMessaging -import com.google.firebase.messaging.ktx.messaging +import com.google.firebase.messaging.messaging import com.google.samples.apps.nowinandroid.core.data.util.SyncManager import com.google.samples.apps.nowinandroid.sync.status.FirebaseSyncSubscriber import com.google.samples.apps.nowinandroid.sync.status.SyncSubscriber