From 8d38720b4c9472cc50337ed753c4ccda315ea43b Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 5 Aug 2025 05:24:34 -0400 Subject: [PATCH 1/2] Auto-update dependencies. --- app/build.gradle.kts | 6 +++--- build.gradle.kts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2393bfb..4eee88c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -43,7 +43,7 @@ android { dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:33.16.0")) + implementation(platform("com.google.firebase:firebase-bom:34.0.0")) // Firestore implementation("com.google.firebase:firebase-firestore-ktx") @@ -65,8 +65,8 @@ dependencies { implementation("com.google.android.material:material:1.12.0") implementation("androidx.multidex:multidex:2.0.1") implementation("androidx.recyclerview:recyclerview:1.4.0") - implementation("androidx.navigation:navigation-fragment-ktx:2.9.2") - implementation("androidx.navigation:navigation-ui-ktx:2.9.2") + implementation("androidx.navigation:navigation-fragment-ktx:2.9.3") + implementation("androidx.navigation:navigation-ui-ktx:2.9.3") implementation("androidx.startup:startup-runtime:1.2.0") // Android architecture components diff --git a/build.gradle.kts b/build.gradle.kts index 07ce189..4f499c4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,11 +2,11 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask plugins { - id("com.android.application") version "8.11.1" apply false - id("com.android.library") version "8.11.1" apply false + id("com.android.application") version "8.12.0" apply false + id("com.android.library") version "8.12.0" apply false id("org.jetbrains.kotlin.android") version "2.2.0" apply false id("com.google.gms.google-services") version "4.4.3" apply false - id("androidx.navigation.safeargs") version "2.9.2" apply false + id("androidx.navigation.safeargs") version "2.9.3" apply false id("com.github.ben-manes.versions") version "0.52.0" apply true } From 1dc246c408d8da03777c8c4cd2a23b9e902db519 Mon Sep 17 00:00:00 2001 From: rosariopf Date: Tue, 5 Aug 2025 21:24:28 +0100 Subject: [PATCH 2/2] chore: replace deprecated firebase ktx modules --- app/build.gradle.kts | 4 ++-- .../com/google/firebase/example/fireeats/MainFragment.kt | 6 +++--- .../firebase/example/fireeats/RatingDialogFragment.kt | 4 ++-- .../firebase/example/fireeats/RestaurantDetailFragment.kt | 6 +++--- .../firebase/example/fireeats/adapter/RatingAdapter.kt | 2 +- .../firebase/example/fireeats/adapter/RestaurantAdapter.kt | 2 +- .../firebase/example/fireeats/util/AuthInitializer.kt | 4 ++-- .../firebase/example/fireeats/util/FirestoreInitializer.kt | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4eee88c..8f5bdb3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -46,10 +46,10 @@ dependencies { implementation(platform("com.google.firebase:firebase-bom:34.0.0")) // Firestore - implementation("com.google.firebase:firebase-firestore-ktx") + implementation("com.google.firebase:firebase-firestore") // Other Firebase/Play services deps - implementation("com.google.firebase:firebase-auth-ktx") + implementation("com.google.firebase:firebase-auth") // Pinned to 20.7.0 as a workaround for issue https://github.com/firebase/quickstart-android/issues/1647 implementation("com.google.android.gms:play-services-auth:20.7.0") diff --git a/app/src/main/java/com/google/firebase/example/fireeats/MainFragment.kt b/app/src/main/java/com/google/firebase/example/fireeats/MainFragment.kt index a5796d0..0aa7aff 100644 --- a/app/src/main/java/com/google/firebase/example/fireeats/MainFragment.kt +++ b/app/src/main/java/com/google/firebase/example/fireeats/MainFragment.kt @@ -21,7 +21,7 @@ import com.firebase.ui.auth.ErrorCodes import com.firebase.ui.auth.FirebaseAuthUIActivityResultContract import com.firebase.ui.auth.data.model.FirebaseAuthUIAuthenticationResult import com.google.android.material.snackbar.Snackbar -import com.google.firebase.auth.ktx.auth +import com.google.firebase.auth.auth import com.google.firebase.example.fireeats.databinding.FragmentMainBinding import com.google.firebase.example.fireeats.adapter.RestaurantAdapter import com.google.firebase.example.fireeats.model.Restaurant @@ -30,8 +30,8 @@ import com.google.firebase.firestore.DocumentSnapshot import com.google.firebase.firestore.FirebaseFirestore import com.google.firebase.firestore.FirebaseFirestoreException import com.google.firebase.firestore.Query -import com.google.firebase.firestore.ktx.firestore -import com.google.firebase.ktx.Firebase +import com.google.firebase.firestore.firestore +import com.google.firebase.Firebase class MainFragment : Fragment(), FilterDialogFragment.FilterListener, diff --git a/app/src/main/java/com/google/firebase/example/fireeats/RatingDialogFragment.kt b/app/src/main/java/com/google/firebase/example/fireeats/RatingDialogFragment.kt index 28586a0..4a5759f 100644 --- a/app/src/main/java/com/google/firebase/example/fireeats/RatingDialogFragment.kt +++ b/app/src/main/java/com/google/firebase/example/fireeats/RatingDialogFragment.kt @@ -6,10 +6,10 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.DialogFragment -import com.google.firebase.auth.ktx.auth +import com.google.firebase.auth.auth import com.google.firebase.example.fireeats.databinding.DialogRatingBinding import com.google.firebase.example.fireeats.model.Rating -import com.google.firebase.ktx.Firebase +import com.google.firebase.Firebase /** * Dialog Fragment containing rating form. diff --git a/app/src/main/java/com/google/firebase/example/fireeats/RestaurantDetailFragment.kt b/app/src/main/java/com/google/firebase/example/fireeats/RestaurantDetailFragment.kt index bdf75e8..cb9f29e 100644 --- a/app/src/main/java/com/google/firebase/example/fireeats/RestaurantDetailFragment.kt +++ b/app/src/main/java/com/google/firebase/example/fireeats/RestaurantDetailFragment.kt @@ -25,9 +25,9 @@ import com.google.firebase.firestore.FirebaseFirestore import com.google.firebase.firestore.FirebaseFirestoreException import com.google.firebase.firestore.ListenerRegistration import com.google.firebase.firestore.Query -import com.google.firebase.firestore.ktx.firestore -import com.google.firebase.firestore.ktx.toObject -import com.google.firebase.ktx.Firebase +import com.google.firebase.firestore.firestore +import com.google.firebase.firestore.toObject +import com.google.firebase.Firebase class RestaurantDetailFragment : Fragment(), EventListener, diff --git a/app/src/main/java/com/google/firebase/example/fireeats/adapter/RatingAdapter.kt b/app/src/main/java/com/google/firebase/example/fireeats/adapter/RatingAdapter.kt index e1a55b8..e85b742 100644 --- a/app/src/main/java/com/google/firebase/example/fireeats/adapter/RatingAdapter.kt +++ b/app/src/main/java/com/google/firebase/example/fireeats/adapter/RatingAdapter.kt @@ -6,7 +6,7 @@ import androidx.recyclerview.widget.RecyclerView import com.google.firebase.example.fireeats.databinding.ItemRatingBinding import com.google.firebase.example.fireeats.model.Rating import com.google.firebase.firestore.Query -import com.google.firebase.firestore.ktx.toObject +import com.google.firebase.firestore.toObject import java.text.SimpleDateFormat import java.util.Locale diff --git a/app/src/main/java/com/google/firebase/example/fireeats/adapter/RestaurantAdapter.kt b/app/src/main/java/com/google/firebase/example/fireeats/adapter/RestaurantAdapter.kt index bd81ad6..3f24a33 100644 --- a/app/src/main/java/com/google/firebase/example/fireeats/adapter/RestaurantAdapter.kt +++ b/app/src/main/java/com/google/firebase/example/fireeats/adapter/RestaurantAdapter.kt @@ -10,7 +10,7 @@ import com.google.firebase.example.fireeats.model.Restaurant import com.google.firebase.example.fireeats.util.RestaurantUtil import com.google.firebase.firestore.DocumentSnapshot import com.google.firebase.firestore.Query -import com.google.firebase.firestore.ktx.toObject +import com.google.firebase.firestore.toObject /** * RecyclerView adapter for a list of Restaurants. diff --git a/app/src/main/java/com/google/firebase/example/fireeats/util/AuthInitializer.kt b/app/src/main/java/com/google/firebase/example/fireeats/util/AuthInitializer.kt index 3da5771..56bc70e 100644 --- a/app/src/main/java/com/google/firebase/example/fireeats/util/AuthInitializer.kt +++ b/app/src/main/java/com/google/firebase/example/fireeats/util/AuthInitializer.kt @@ -3,9 +3,9 @@ package com.google.firebase.example.fireeats.util import android.content.Context import androidx.startup.Initializer import com.google.firebase.auth.FirebaseAuth -import com.google.firebase.auth.ktx.auth +import com.google.firebase.auth.auth import com.google.firebase.example.fireeats.BuildConfig -import com.google.firebase.ktx.Firebase +import com.google.firebase.Firebase class AuthInitializer : Initializer { // The host '10.0.2.2' is a special IP address to let the diff --git a/app/src/main/java/com/google/firebase/example/fireeats/util/FirestoreInitializer.kt b/app/src/main/java/com/google/firebase/example/fireeats/util/FirestoreInitializer.kt index 59b0dae..822c903 100644 --- a/app/src/main/java/com/google/firebase/example/fireeats/util/FirestoreInitializer.kt +++ b/app/src/main/java/com/google/firebase/example/fireeats/util/FirestoreInitializer.kt @@ -4,8 +4,8 @@ import android.content.Context import androidx.startup.Initializer import com.google.firebase.example.fireeats.BuildConfig import com.google.firebase.firestore.FirebaseFirestore -import com.google.firebase.firestore.ktx.firestore -import com.google.firebase.ktx.Firebase +import com.google.firebase.firestore.firestore +import com.google.firebase.Firebase class FirestoreInitializer : Initializer {