Skip to content

Commit 1dc246c

Browse files
committed
chore: replace deprecated firebase ktx modules
1 parent 8d38720 commit 1dc246c

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ dependencies {
4646
implementation(platform("com.google.firebase:firebase-bom:34.0.0"))
4747

4848
// Firestore
49-
implementation("com.google.firebase:firebase-firestore-ktx")
49+
implementation("com.google.firebase:firebase-firestore")
5050

5151
// Other Firebase/Play services deps
52-
implementation("com.google.firebase:firebase-auth-ktx")
52+
implementation("com.google.firebase:firebase-auth")
5353

5454
// Pinned to 20.7.0 as a workaround for issue https://github.com/firebase/quickstart-android/issues/1647
5555
implementation("com.google.android.gms:play-services-auth:20.7.0")

app/src/main/java/com/google/firebase/example/fireeats/MainFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import com.firebase.ui.auth.ErrorCodes
2121
import com.firebase.ui.auth.FirebaseAuthUIActivityResultContract
2222
import com.firebase.ui.auth.data.model.FirebaseAuthUIAuthenticationResult
2323
import com.google.android.material.snackbar.Snackbar
24-
import com.google.firebase.auth.ktx.auth
24+
import com.google.firebase.auth.auth
2525
import com.google.firebase.example.fireeats.databinding.FragmentMainBinding
2626
import com.google.firebase.example.fireeats.adapter.RestaurantAdapter
2727
import com.google.firebase.example.fireeats.model.Restaurant
@@ -30,8 +30,8 @@ import com.google.firebase.firestore.DocumentSnapshot
3030
import com.google.firebase.firestore.FirebaseFirestore
3131
import com.google.firebase.firestore.FirebaseFirestoreException
3232
import com.google.firebase.firestore.Query
33-
import com.google.firebase.firestore.ktx.firestore
34-
import com.google.firebase.ktx.Firebase
33+
import com.google.firebase.firestore.firestore
34+
import com.google.firebase.Firebase
3535

3636
class MainFragment : Fragment(),
3737
FilterDialogFragment.FilterListener,

app/src/main/java/com/google/firebase/example/fireeats/RatingDialogFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
88
import androidx.fragment.app.DialogFragment
9-
import com.google.firebase.auth.ktx.auth
9+
import com.google.firebase.auth.auth
1010
import com.google.firebase.example.fireeats.databinding.DialogRatingBinding
1111
import com.google.firebase.example.fireeats.model.Rating
12-
import com.google.firebase.ktx.Firebase
12+
import com.google.firebase.Firebase
1313

1414
/**
1515
* Dialog Fragment containing rating form.

app/src/main/java/com/google/firebase/example/fireeats/RestaurantDetailFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import com.google.firebase.firestore.FirebaseFirestore
2525
import com.google.firebase.firestore.FirebaseFirestoreException
2626
import com.google.firebase.firestore.ListenerRegistration
2727
import com.google.firebase.firestore.Query
28-
import com.google.firebase.firestore.ktx.firestore
29-
import com.google.firebase.firestore.ktx.toObject
30-
import com.google.firebase.ktx.Firebase
28+
import com.google.firebase.firestore.firestore
29+
import com.google.firebase.firestore.toObject
30+
import com.google.firebase.Firebase
3131

3232
class RestaurantDetailFragment : Fragment(),
3333
EventListener<DocumentSnapshot>,

app/src/main/java/com/google/firebase/example/fireeats/adapter/RatingAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import androidx.recyclerview.widget.RecyclerView
66
import com.google.firebase.example.fireeats.databinding.ItemRatingBinding
77
import com.google.firebase.example.fireeats.model.Rating
88
import com.google.firebase.firestore.Query
9-
import com.google.firebase.firestore.ktx.toObject
9+
import com.google.firebase.firestore.toObject
1010
import java.text.SimpleDateFormat
1111
import java.util.Locale
1212

app/src/main/java/com/google/firebase/example/fireeats/adapter/RestaurantAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.google.firebase.example.fireeats.model.Restaurant
1010
import com.google.firebase.example.fireeats.util.RestaurantUtil
1111
import com.google.firebase.firestore.DocumentSnapshot
1212
import com.google.firebase.firestore.Query
13-
import com.google.firebase.firestore.ktx.toObject
13+
import com.google.firebase.firestore.toObject
1414

1515
/**
1616
* RecyclerView adapter for a list of Restaurants.

app/src/main/java/com/google/firebase/example/fireeats/util/AuthInitializer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package com.google.firebase.example.fireeats.util
33
import android.content.Context
44
import androidx.startup.Initializer
55
import com.google.firebase.auth.FirebaseAuth
6-
import com.google.firebase.auth.ktx.auth
6+
import com.google.firebase.auth.auth
77
import com.google.firebase.example.fireeats.BuildConfig
8-
import com.google.firebase.ktx.Firebase
8+
import com.google.firebase.Firebase
99

1010
class AuthInitializer : Initializer<FirebaseAuth> {
1111
// The host '10.0.2.2' is a special IP address to let the

app/src/main/java/com/google/firebase/example/fireeats/util/FirestoreInitializer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import android.content.Context
44
import androidx.startup.Initializer
55
import com.google.firebase.example.fireeats.BuildConfig
66
import com.google.firebase.firestore.FirebaseFirestore
7-
import com.google.firebase.firestore.ktx.firestore
8-
import com.google.firebase.ktx.Firebase
7+
import com.google.firebase.firestore.firestore
8+
import com.google.firebase.Firebase
99

1010
class FirestoreInitializer : Initializer<FirebaseFirestore> {
1111

0 commit comments

Comments
 (0)