Merge pull request #1006 from thatfiredev/rpf-update-firebase-ktx

upgrade to Firebase BoM 32.5.0 and remove Firebase KTX

app/dependencies/prodReleaseRuntimeClasspath.txt

@@ -147,12 +147,12 @@ com.google.android.gms:play-services-ads-identifier:18.0.0
 com.google.android.gms:play-services-base:18.0.1
 com.google.android.gms:play-services-basement:18.1.0
 com.google.android.gms:play-services-cloud-messaging:17.0.1
-com.google.android.gms:play-services-measurement-api:21.4.0
+com.google.android.gms:play-services-measurement-api:21.5.0
-com.google.android.gms:play-services-measurement-base:21.4.0
+com.google.android.gms:play-services-measurement-base:21.5.0
-com.google.android.gms:play-services-measurement-impl:21.4.0
+com.google.android.gms:play-services-measurement-impl:21.5.0
-com.google.android.gms:play-services-measurement-sdk-api:21.4.0
+com.google.android.gms:play-services-measurement-sdk-api:21.5.0
-com.google.android.gms:play-services-measurement-sdk:21.4.0
+com.google.android.gms:play-services-measurement-sdk:21.5.0
-com.google.android.gms:play-services-measurement:21.4.0
+com.google.android.gms:play-services-measurement:21.5.0
 com.google.android.gms:play-services-oss-licenses:17.0.1
 com.google.android.gms:play-services-stats:17.0.2
 com.google.android.gms:play-services-tasks:18.0.2
@@ -163,16 +163,15 @@ com.google.dagger:hilt-android:2.51.1
 com.google.dagger:hilt-core:2.51.1
 com.google.errorprone:error_prone_annotations:2.11.0
 com.google.firebase:firebase-abt:21.1.1
-com.google.firebase:firebase-analytics-ktx:21.4.0
+com.google.firebase:firebase-analytics-ktx:21.5.0
-com.google.firebase:firebase-analytics:21.4.0
+com.google.firebase:firebase-analytics:21.5.0
 com.google.firebase:firebase-annotations:16.2.0
-com.google.firebase:firebase-bom:32.4.0
+com.google.firebase:firebase-bom:32.5.0
 com.google.firebase:firebase-common-ktx:20.4.2
 com.google.firebase:firebase-common:20.4.2
 com.google.firebase:firebase-components:17.1.5
 com.google.firebase:firebase-config:21.5.0
-com.google.firebase:firebase-crashlytics-ktx:18.5.0
+com.google.firebase:firebase-crashlytics:18.5.1
-com.google.firebase:firebase-crashlytics:18.5.0
 com.google.firebase:firebase-datatransport:18.1.8
 com.google.firebase:firebase-encoders-json:18.0.1
 com.google.firebase:firebase-encoders-proto:16.0.0
@@ -181,9 +180,7 @@ com.google.firebase:firebase-iid-interop:17.1.0
 com.google.firebase:firebase-installations-interop:17.1.1
 com.google.firebase:firebase-installations:17.2.0
 com.google.firebase:firebase-measurement-connector:19.0.0
-com.google.firebase:firebase-messaging-ktx:23.3.0
+com.google.firebase:firebase-messaging:23.3.1
-com.google.firebase:firebase-messaging:23.3.0
-com.google.firebase:firebase-perf-ktx:20.5.0
 com.google.firebase:firebase-perf:20.5.0
 com.google.firebase:firebase-sessions:1.1.0
 com.google.firebase:protolite-well-known-types:18.0.0

app/prodRelease-badging.txt

@@ -105,6 +105,7 @@ application-icon-640:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application-icon-65534:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application: label='Now in Android' icon='res/mipmap-anydpi-v26/ic_launcher.xml'
 launchable-activity: name='com.google.samples.apps.nowinandroid.MainActivity'  label='' icon=''
+property: name='android.adservices.AD_SERVICES_CONFIG' resource='res/xml/ga_ad_services_config.xml' 
 uses-library-not-required:'androidx.window.extensions'
 uses-library-not-required:'androidx.window.sidecar'
 uses-library-not-required:'android.ext.adservices'

app/src/main/AndroidManifest.xml

@@ -20,11 +20,13 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <!--
-    Firebase automatically adds the AD_ID permission, even though we don't use it. If you use this
+    Firebase automatically adds these AD_ID and ADSERVICES permissions, even though we don't use them.
-    permission you must declare how you're using it to Google Play, otherwise the app will be
+    If you use these permissions you must declare how you're using them to Google Play, otherwise the
-    rejected when publishing it. To avoid this we remove the permission entirely.
+    app will be rejected when publishing it. To avoid this we remove the permissions entirely.
     -->
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
+    <uses-permission android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION" tools:node="remove"/>
+    <uses-permission android:name="android.permission.ACCESS_ADSERVICES_AD_ID" tools:node="remove"/>
 
     <application
         android:name=".NiaApplication"

core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt

@@ -16,9 +16,9 @@
 
 package com.google.samples.apps.nowinandroid.core.analytics
 
+import com.google.firebase.Firebase
 import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.analytics.ktx.analytics
+import com.google.firebase.analytics.analytics
-import com.google.firebase.ktx.Firebase
 import dagger.Binds
 import dagger.Module
 import dagger.Provides

core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/FirebaseAnalyticsHelper.kt

@@ -17,7 +17,7 @@
 package com.google.samples.apps.nowinandroid.core.analytics
 
 import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.analytics.ktx.logEvent
+import com.google.firebase.analytics.logEvent
 import javax.inject.Inject
 
 /**

gradle/libs.versions.toml

@@ -32,7 +32,7 @@ androidxWindowManager = "1.3.0-alpha03"
 androidxWork = "2.9.0"
 coil = "2.6.0"
 dependencyGuard = "0.5.0"
-firebaseBom = "32.4.0"
+firebaseBom = "32.5.0"
 firebaseCrashlyticsPlugin = "2.9.9"
 firebasePerfPlugin = "1.4.2"
 gmsPlugin = "4.4.1"
@@ -113,9 +113,10 @@ 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-cloud-messaging = { group = "com.google.firebase", name = "firebase-messaging" }
-firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics-ktx" }
+firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" }
-firebase-performance = { group = "com.google.firebase", name = "firebase-perf-ktx" }
+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" }
 hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }

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