From 898961d2b738f93553eebb5cb6a0411115ced244 Mon Sep 17 00:00:00 2001
From: rosariopf <rosariopf@google.com>
Date: Mon, 30 Oct 2023 17:35:33 +0000
Subject: [PATCH] refactor(analytics, fiam): use BoM 32.5.0 and drop ktx

---
 analytics/app/build.gradle.kts                              | 2 +-
 .../firebase/quickstart/analytics/kotlin/MainActivity.kt    | 6 +++---
 inappmessaging/app/build.gradle.kts                         | 2 +-
 .../firebase/fiamquickstart/kotlin/KotlinMainActivity.kt    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/analytics/app/build.gradle.kts b/analytics/app/build.gradle.kts
index 209bee4cc..be38cfb1a 100644
--- a/analytics/app/build.gradle.kts
+++ b/analytics/app/build.gradle.kts
@@ -56,7 +56,7 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
 
     // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
-    implementation(platform("com.google.firebase:firebase-bom:32.4.1"))
+    implementation(platform("com.google.firebase:firebase-bom:32.5.0"))
 
     // Firebase Analytics
     implementation("com.google.firebase:firebase-analytics")
diff --git a/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/kotlin/MainActivity.kt b/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/kotlin/MainActivity.kt
index 1ce5d929f..f0e2dd7d3 100644
--- a/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/kotlin/MainActivity.kt
+++ b/analytics/app/src/main/java/com/google/firebase/quickstart/analytics/kotlin/MainActivity.kt
@@ -15,10 +15,10 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
+import com.google.firebase.Firebase
 import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.analytics.ktx.analytics
-import com.google.firebase.analytics.ktx.logEvent
-import com.google.firebase.ktx.Firebase
+import com.google.firebase.analytics.analytics
+import com.google.firebase.analytics.logEvent
 import com.google.firebase.quickstart.analytics.R
 import com.google.firebase.quickstart.analytics.databinding.ActivityMainBinding
 import com.google.firebase.quickstart.analytics.kotlin.MainActivity.Companion.IMAGE_INFOS
diff --git a/inappmessaging/app/build.gradle.kts b/inappmessaging/app/build.gradle.kts
index b0262e3c4..410ca5898 100644
--- a/inappmessaging/app/build.gradle.kts
+++ b/inappmessaging/app/build.gradle.kts
@@ -52,7 +52,7 @@ dependencies {
     implementation("androidx.multidex:multidex:2.0.1")
 
     // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom)
-    implementation(platform("com.google.firebase:firebase-bom:32.4.1"))
+    implementation(platform("com.google.firebase:firebase-bom:32.5.0"))
 
     // FIAM
     implementation("com.google.firebase:firebase-inappmessaging-display")
diff --git a/inappmessaging/app/src/main/java/com/google/firebase/fiamquickstart/kotlin/KotlinMainActivity.kt b/inappmessaging/app/src/main/java/com/google/firebase/fiamquickstart/kotlin/KotlinMainActivity.kt
index 4da4e0ee9..92b6452dd 100644
--- a/inappmessaging/app/src/main/java/com/google/firebase/fiamquickstart/kotlin/KotlinMainActivity.kt
+++ b/inappmessaging/app/src/main/java/com/google/firebase/fiamquickstart/kotlin/KotlinMainActivity.kt
@@ -5,13 +5,13 @@ import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.snackbar.Snackbar
 import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.fiamquickstart.R
 import com.google.firebase.fiamquickstart.databinding.ActivityMainBinding
 import com.google.firebase.inappmessaging.FirebaseInAppMessaging
 import com.google.firebase.inappmessaging.inAppMessaging
 import com.google.firebase.installations.installations
 import com.google.firebase.Firebase
+import com.google.firebase.analytics.analytics
 
 class KotlinMainActivity : AppCompatActivity() {
 
@@ -23,7 +23,7 @@ class KotlinMainActivity : AppCompatActivity() {
         val binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        firebaseAnalytics = com.google.firebase.ktx.Firebase.analytics
+        firebaseAnalytics = Firebase.analytics
         firebaseIam = Firebase.inAppMessaging
 
         firebaseIam.isAutomaticDataCollectionEnabled = true