From 1aeeacc8493b993ad90746b5ffd7e6ced11dd04e Mon Sep 17 00:00:00 2001 From: rosariopf Date: Wed, 4 Oct 2023 01:30:43 +0100 Subject: [PATCH 1/8] refactor(*): remove ktx imports --- .../quickstart/analytics/kotlin/MainActivity.kt | 6 +++--- .../kotlin/KotlinMainActivity.kt | 4 ++-- .../auth/kotlin/AnonymousAuthFragment.kt | 4 ++-- .../quickstart/auth/kotlin/CustomAuthFragment.kt | 4 ++-- .../auth/kotlin/EmailPasswordFragment.kt | 4 ++-- .../auth/kotlin/FacebookLoginFragment.kt | 4 ++-- .../quickstart/auth/kotlin/FirebaseUIFragment.kt | 4 ++-- .../quickstart/auth/kotlin/GenericIdpFragment.kt | 6 +++--- .../quickstart/auth/kotlin/GoogleSignInFragment.kt | 4 ++-- .../auth/kotlin/MultiFactorEnrollFragment.kt | 4 ++-- .../quickstart/auth/kotlin/MultiFactorFragment.kt | 4 ++-- .../auth/kotlin/MultiFactorUnenrollFragment.kt | 4 ++-- .../quickstart/auth/kotlin/PasswordlessActivity.kt | 6 +++--- .../quickstart/auth/kotlin/PhoneAuthFragment.kt | 4 ++-- .../quickstart/config/kotlin/MainActivity.kt | 8 ++++---- .../quickstart/crash/kotlin/CustomKeySamples.kt | 6 +++--- .../quickstart/crash/kotlin/MainActivity.kt | 6 +++--- .../quickstart/database/kotlin/BaseFragment.kt | 4 ++-- .../quickstart/database/kotlin/MainFragment.kt | 4 ++-- .../quickstart/database/kotlin/NewPostFragment.kt | 6 +++--- .../database/kotlin/PostDetailFragment.kt | 6 +++--- .../quickstart/database/kotlin/SignInFragment.kt | 6 +++--- .../kotlin/listfragments/PostListFragment.kt | 6 +++--- .../quickstart/deeplinks/kotlin/MainActivity.kt | 14 +++++++------- .../example/fireeats/kotlin/MainFragment.kt | 6 +++--- .../fireeats/kotlin/RatingDialogFragment.kt | 4 ++-- .../fireeats/kotlin/RestaurantDetailFragment.kt | 6 +++--- .../fireeats/kotlin/adapter/RatingAdapter.kt | 2 +- .../fireeats/kotlin/adapter/RestaurantAdapter.kt | 2 +- .../quickstart/functions/kotlin/MainActivity.kt | 6 +++--- .../fiamquickstart/kotlin/KotlinMainActivity.kt | 8 ++++---- .../firebase/quickstart/fcm/kotlin/MainActivity.kt | 4 ++-- .../quickstart/perfmon/kotlin/MainActivity.kt | 4 ++-- .../firebasestorage/kotlin/MainActivity.kt | 4 ++-- .../firebasestorage/kotlin/MyDownloadService.kt | 8 ++++---- .../firebasestorage/kotlin/MyUploadService.kt | 8 ++++---- 36 files changed, 95 insertions(+), 95 deletions(-) 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 1ce5d929f3..059338e241 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 @@ -16,9 +16,9 @@ import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator 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.Firebase 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/appdistribution/app/src/main/java/com/google/firebase/appdistributionquickstart/kotlin/KotlinMainActivity.kt b/appdistribution/app/src/main/java/com/google/firebase/appdistributionquickstart/kotlin/KotlinMainActivity.kt index 7de80df0f7..841dd4bacb 100644 --- a/appdistribution/app/src/main/java/com/google/firebase/appdistributionquickstart/kotlin/KotlinMainActivity.kt +++ b/appdistribution/app/src/main/java/com/google/firebase/appdistributionquickstart/kotlin/KotlinMainActivity.kt @@ -4,9 +4,9 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.google.firebase.appdistribution.FirebaseAppDistribution import com.google.firebase.appdistribution.FirebaseAppDistributionException -import com.google.firebase.appdistribution.ktx.appDistribution +import com.google.firebase.appdistribution.appDistribution import com.google.firebase.appdistributionquickstart.databinding.ActivityMainBinding -import com.google.firebase.ktx.Firebase +import com.google.firebase.Firebase class KotlinMainActivity : AppCompatActivity() { diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/AnonymousAuthFragment.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/AnonymousAuthFragment.kt index ec235a3aee..6587c5eccd 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/AnonymousAuthFragment.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/AnonymousAuthFragment.kt @@ -10,8 +10,8 @@ import android.widget.Toast import com.google.firebase.auth.EmailAuthProvider import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.R import com.google.firebase.quickstart.auth.databinding.FragmentAnonymousAuthBinding diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/CustomAuthFragment.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/CustomAuthFragment.kt index 1f6c843590..b668e8dd7c 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/CustomAuthFragment.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/CustomAuthFragment.kt @@ -9,8 +9,8 @@ import android.widget.Toast import androidx.fragment.app.Fragment import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.R import com.google.firebase.quickstart.auth.databinding.FragmentCustomBinding diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/EmailPasswordFragment.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/EmailPasswordFragment.kt index 272a362154..c60c6ef5a2 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/EmailPasswordFragment.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/EmailPasswordFragment.kt @@ -12,8 +12,8 @@ import androidx.navigation.fragment.findNavController import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseAuthMultiFactorException import com.google.firebase.auth.FirebaseUser -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.R import com.google.firebase.quickstart.auth.databinding.FragmentEmailpasswordBinding diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FacebookLoginFragment.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FacebookLoginFragment.kt index 260ef0edf7..d591b0f383 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FacebookLoginFragment.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FacebookLoginFragment.kt @@ -15,8 +15,8 @@ import com.facebook.login.LoginResult import com.google.firebase.auth.FacebookAuthProvider import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.R import com.google.firebase.quickstart.auth.databinding.FragmentFacebookBinding diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FirebaseUIFragment.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FirebaseUIFragment.kt index ccd48d5d78..de2d91bd3e 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FirebaseUIFragment.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FirebaseUIFragment.kt @@ -12,8 +12,8 @@ import com.firebase.ui.auth.FirebaseAuthUIActivityResultContract import com.firebase.ui.auth.data.model.FirebaseAuthUIAuthenticationResult import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.BuildConfig import com.google.firebase.quickstart.auth.R import com.google.firebase.quickstart.auth.databinding.FragmentFirebaseUiBinding diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GenericIdpFragment.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GenericIdpFragment.kt index 02b435610d..872edd8c5e 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GenericIdpFragment.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GenericIdpFragment.kt @@ -26,9 +26,9 @@ import android.widget.ArrayAdapter import android.widget.Toast import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser -import com.google.firebase.auth.ktx.auth -import com.google.firebase.auth.ktx.oAuthProvider -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.auth.oAuthProvider +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.R import com.google.firebase.quickstart.auth.databinding.FragmentGenericIdpBinding import java.util.ArrayList diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GoogleSignInFragment.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GoogleSignInFragment.kt index 47a482a600..311b9daefe 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GoogleSignInFragment.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GoogleSignInFragment.kt @@ -19,8 +19,8 @@ import com.google.android.material.snackbar.Snackbar import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser import com.google.firebase.auth.GoogleAuthProvider -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.R import com.google.firebase.quickstart.auth.databinding.FragmentGoogleBinding diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorEnrollFragment.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorEnrollFragment.kt index f9b723c2d7..9e640333eb 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorEnrollFragment.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorEnrollFragment.kt @@ -13,8 +13,8 @@ import com.google.firebase.auth.PhoneAuthCredential import com.google.firebase.auth.PhoneAuthOptions import com.google.firebase.auth.PhoneAuthProvider import com.google.firebase.auth.PhoneMultiFactorGenerator -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.databinding.FragmentPhoneAuthBinding import java.util.concurrent.TimeUnit diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorFragment.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorFragment.kt index 1990d21239..ce2c9f0475 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorFragment.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorFragment.kt @@ -12,8 +12,8 @@ import androidx.navigation.fragment.findNavController import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser import com.google.firebase.auth.PhoneMultiFactorInfo -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.R import com.google.firebase.quickstart.auth.databinding.FragmentMultiFactorBinding diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorUnenrollFragment.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorUnenrollFragment.kt index 768b2ff3f9..2e83931458 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorUnenrollFragment.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/MultiFactorUnenrollFragment.kt @@ -8,8 +8,8 @@ import android.widget.Toast import androidx.navigation.fragment.findNavController import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.PhoneMultiFactorInfo -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.databinding.FragmentMultiFactorSignInBinding class MultiFactorUnenrollFragment : BaseFragment() { diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PasswordlessActivity.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PasswordlessActivity.kt index 1c82161c61..b57de92736 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PasswordlessActivity.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PasswordlessActivity.kt @@ -10,9 +10,9 @@ import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseAuthActionCodeException import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException import com.google.firebase.auth.FirebaseUser -import com.google.firebase.auth.ktx.actionCodeSettings -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.actionCodeSettings +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.R import com.google.firebase.quickstart.auth.databinding.ActivityPasswordlessBinding diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PhoneAuthFragment.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PhoneAuthFragment.kt index af98ef57bf..bc312bc29d 100644 --- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PhoneAuthFragment.kt +++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/PhoneAuthFragment.kt @@ -16,8 +16,8 @@ import com.google.firebase.auth.FirebaseUser import com.google.firebase.auth.PhoneAuthCredential import com.google.firebase.auth.PhoneAuthOptions import com.google.firebase.auth.PhoneAuthProvider -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.auth.R import com.google.firebase.quickstart.auth.databinding.FragmentPhoneAuthBinding import java.util.concurrent.TimeUnit diff --git a/config/app/src/main/java/com/google/samples/quickstart/config/kotlin/MainActivity.kt b/config/app/src/main/java/com/google/samples/quickstart/config/kotlin/MainActivity.kt index 7945a84965..7ae8442fe5 100644 --- a/config/app/src/main/java/com/google/samples/quickstart/config/kotlin/MainActivity.kt +++ b/config/app/src/main/java/com/google/samples/quickstart/config/kotlin/MainActivity.kt @@ -4,14 +4,14 @@ import android.os.Bundle import android.util.Log import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.google.firebase.ktx.Firebase +import com.google.firebase.Firebase import com.google.firebase.remoteconfig.ConfigUpdate import com.google.firebase.remoteconfig.ConfigUpdateListener import com.google.firebase.remoteconfig.FirebaseRemoteConfig import com.google.firebase.remoteconfig.FirebaseRemoteConfigException -import com.google.firebase.remoteconfig.ktx.get -import com.google.firebase.remoteconfig.ktx.remoteConfig -import com.google.firebase.remoteconfig.ktx.remoteConfigSettings +import com.google.firebase.remoteconfig.get +import com.google.firebase.remoteconfig.remoteConfig +import com.google.firebase.remoteconfig.remoteConfigSettings import com.google.samples.quickstart.config.R import com.google.samples.quickstart.config.databinding.ActivityMainBinding diff --git a/crash/app/src/main/java/com/google/samples/quickstart/crash/kotlin/CustomKeySamples.kt b/crash/app/src/main/java/com/google/samples/quickstart/crash/kotlin/CustomKeySamples.kt index c1dfb8fc48..f55e505c81 100644 --- a/crash/app/src/main/java/com/google/samples/quickstart/crash/kotlin/CustomKeySamples.kt +++ b/crash/app/src/main/java/com/google/samples/quickstart/crash/kotlin/CustomKeySamples.kt @@ -13,9 +13,9 @@ import android.telephony.TelephonyManager import android.view.View import androidx.core.content.ContextCompat import com.google.android.gms.common.GoogleApiAvailability -import com.google.firebase.crashlytics.ktx.crashlytics -import com.google.firebase.crashlytics.ktx.setCustomKeys -import com.google.firebase.ktx.Firebase +import com.google.firebase.crashlytics.crashlytics +import com.google.firebase.crashlytics.setCustomKeys +import com.google.firebase.Firebase import kotlinx.coroutines.internal.synchronized /** diff --git a/crash/app/src/main/java/com/google/samples/quickstart/crash/kotlin/MainActivity.kt b/crash/app/src/main/java/com/google/samples/quickstart/crash/kotlin/MainActivity.kt index 49fed135a5..4f9825e6af 100644 --- a/crash/app/src/main/java/com/google/samples/quickstart/crash/kotlin/MainActivity.kt +++ b/crash/app/src/main/java/com/google/samples/quickstart/crash/kotlin/MainActivity.kt @@ -3,9 +3,9 @@ package com.google.samples.quickstart.crash.kotlin import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.google.firebase.crashlytics.FirebaseCrashlytics -import com.google.firebase.crashlytics.ktx.crashlytics -import com.google.firebase.crashlytics.ktx.setCustomKeys -import com.google.firebase.ktx.Firebase +import com.google.firebase.crashlytics.crashlytics +import com.google.firebase.crashlytics.setCustomKeys +import com.google.firebase.Firebase import com.google.samples.quickstart.crash.databinding.ActivityMainBinding /** diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/BaseFragment.kt b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/BaseFragment.kt index d774d46b2e..0a559170e7 100644 --- a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/BaseFragment.kt +++ b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/BaseFragment.kt @@ -3,8 +3,8 @@ package com.google.firebase.quickstart.database.kotlin import android.view.View import android.widget.ProgressBar import androidx.fragment.app.Fragment -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase open class BaseFragment : Fragment() { private var progressBar: ProgressBar? = null diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/MainFragment.kt b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/MainFragment.kt index 95528989ba..25cc8aae45 100644 --- a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/MainFragment.kt +++ b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/MainFragment.kt @@ -13,8 +13,8 @@ import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import androidx.viewpager2.adapter.FragmentStateAdapter import com.google.android.material.tabs.TabLayoutMediator -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.database.R import com.google.firebase.quickstart.database.databinding.FragmentMainBinding import com.google.firebase.quickstart.database.kotlin.listfragments.MyPostsFragment diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/NewPostFragment.kt b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/NewPostFragment.kt index 568a049e79..62eea657e4 100644 --- a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/NewPostFragment.kt +++ b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/NewPostFragment.kt @@ -12,9 +12,9 @@ import com.google.firebase.database.DataSnapshot import com.google.firebase.database.DatabaseError import com.google.firebase.database.DatabaseReference import com.google.firebase.database.ValueEventListener -import com.google.firebase.database.ktx.database -import com.google.firebase.database.ktx.getValue -import com.google.firebase.ktx.Firebase +import com.google.firebase.database.database +import com.google.firebase.database.getValue +import com.google.firebase.Firebase import com.google.firebase.quickstart.database.R import com.google.firebase.quickstart.database.databinding.FragmentNewPostBinding import com.google.firebase.quickstart.database.kotlin.models.Post diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/PostDetailFragment.kt b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/PostDetailFragment.kt index b85bb94151..3ba878ac84 100644 --- a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/PostDetailFragment.kt +++ b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/PostDetailFragment.kt @@ -14,9 +14,9 @@ import com.google.firebase.database.DataSnapshot import com.google.firebase.database.DatabaseError import com.google.firebase.database.DatabaseReference import com.google.firebase.database.ValueEventListener -import com.google.firebase.database.ktx.database -import com.google.firebase.database.ktx.getValue -import com.google.firebase.ktx.Firebase +import com.google.firebase.database.database +import com.google.firebase.database.getValue +import com.google.firebase.Firebase import com.google.firebase.quickstart.database.R import com.google.firebase.quickstart.database.databinding.FragmentPostDetailBinding import com.google.firebase.quickstart.database.kotlin.models.Comment diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/SignInFragment.kt b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/SignInFragment.kt index b1642e2b17..66c8dd6d27 100644 --- a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/SignInFragment.kt +++ b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/SignInFragment.kt @@ -10,10 +10,10 @@ import android.widget.Toast import androidx.navigation.fragment.findNavController import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser -import com.google.firebase.auth.ktx.auth +import com.google.firebase.auth.auth import com.google.firebase.database.DatabaseReference -import com.google.firebase.database.ktx.database -import com.google.firebase.ktx.Firebase +import com.google.firebase.database.database +import com.google.firebase.Firebase import com.google.firebase.quickstart.database.R import com.google.firebase.quickstart.database.databinding.FragmentSignInBinding import com.google.firebase.quickstart.database.kotlin.models.User diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/listfragments/PostListFragment.kt b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/listfragments/PostListFragment.kt index 2b2eb6c67d..0f0456de95 100644 --- a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/listfragments/PostListFragment.kt +++ b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/listfragments/PostListFragment.kt @@ -12,15 +12,15 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.firebase.ui.database.FirebaseRecyclerAdapter import com.firebase.ui.database.FirebaseRecyclerOptions -import com.google.firebase.auth.ktx.auth +import com.google.firebase.auth.auth import com.google.firebase.database.DataSnapshot import com.google.firebase.database.DatabaseError import com.google.firebase.database.DatabaseReference import com.google.firebase.database.MutableData import com.google.firebase.database.Query import com.google.firebase.database.Transaction -import com.google.firebase.database.ktx.database -import com.google.firebase.ktx.Firebase +import com.google.firebase.database.database +import com.google.firebase.Firebase import com.google.firebase.quickstart.database.R import com.google.firebase.quickstart.database.kotlin.PostDetailFragment import com.google.firebase.quickstart.database.kotlin.models.Post diff --git a/dynamiclinks/app/src/main/java/com/google/firebase/quickstart/deeplinks/kotlin/MainActivity.kt b/dynamiclinks/app/src/main/java/com/google/firebase/quickstart/deeplinks/kotlin/MainActivity.kt index fd4667726a..e3f48ce6e9 100644 --- a/dynamiclinks/app/src/main/java/com/google/firebase/quickstart/deeplinks/kotlin/MainActivity.kt +++ b/dynamiclinks/app/src/main/java/com/google/firebase/quickstart/deeplinks/kotlin/MainActivity.kt @@ -10,13 +10,13 @@ import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import com.google.android.material.snackbar.Snackbar import com.google.firebase.dynamiclinks.PendingDynamicLinkData -import com.google.firebase.dynamiclinks.ktx.androidParameters -import com.google.firebase.dynamiclinks.ktx.component1 -import com.google.firebase.dynamiclinks.ktx.component2 -import com.google.firebase.dynamiclinks.ktx.dynamicLink -import com.google.firebase.dynamiclinks.ktx.dynamicLinks -import com.google.firebase.dynamiclinks.ktx.shortLinkAsync -import com.google.firebase.ktx.Firebase +import com.google.firebase.dynamiclinks.androidParameters +import com.google.firebase.dynamiclinks.component1 +import com.google.firebase.dynamiclinks.component2 +import com.google.firebase.dynamiclinks.dynamicLink +import com.google.firebase.dynamiclinks.dynamicLinks +import com.google.firebase.dynamiclinks.shortLinkAsync +import com.google.firebase.Firebase import com.google.firebase.quickstart.deeplinks.R import com.google.firebase.quickstart.deeplinks.databinding.ActivityMainBinding diff --git a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/MainFragment.kt b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/MainFragment.kt index bff72e4bae..34b909b3d9 100644 --- a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/MainFragment.kt +++ b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/MainFragment.kt @@ -24,7 +24,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.R import com.google.firebase.example.fireeats.databinding.FragmentMainBinding import com.google.firebase.example.fireeats.kotlin.adapter.RestaurantAdapter @@ -36,8 +36,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(), diff --git a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/RatingDialogFragment.kt b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/RatingDialogFragment.kt index 8946b2c744..2658f881a8 100644 --- a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/RatingDialogFragment.kt +++ b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/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.kotlin.model.Rating -import com.google.firebase.ktx.Firebase +import com.google.firebase.Firebase /** * Dialog Fragment containing rating form. diff --git a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/RestaurantDetailFragment.kt b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/RestaurantDetailFragment.kt index b2bb779b7a..ecc9623df5 100644 --- a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/RestaurantDetailFragment.kt +++ b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/RestaurantDetailFragment.kt @@ -26,9 +26,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(), diff --git a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/adapter/RatingAdapter.kt b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/adapter/RatingAdapter.kt index 1f8738b632..6682fa4027 100644 --- a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/adapter/RatingAdapter.kt +++ b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/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.kotlin.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/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/adapter/RestaurantAdapter.kt b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/adapter/RestaurantAdapter.kt index d7fe97fab6..3ebe3b02bf 100644 --- a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/adapter/RestaurantAdapter.kt +++ b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/adapter/RestaurantAdapter.kt @@ -10,7 +10,7 @@ import com.google.firebase.example.fireeats.kotlin.model.Restaurant import com.google.firebase.example.fireeats.kotlin.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/functions/app/src/main/java/com/google/samples/quickstart/functions/kotlin/MainActivity.kt b/functions/app/src/main/java/com/google/samples/quickstart/functions/kotlin/MainActivity.kt index dd291611cb..53737abffb 100644 --- a/functions/app/src/main/java/com/google/samples/quickstart/functions/kotlin/MainActivity.kt +++ b/functions/app/src/main/java/com/google/samples/quickstart/functions/kotlin/MainActivity.kt @@ -20,11 +20,11 @@ import com.firebase.ui.auth.data.model.FirebaseAuthUIAuthenticationResult import com.google.android.gms.tasks.OnCompleteListener import com.google.android.gms.tasks.Task import com.google.android.material.snackbar.Snackbar -import com.google.firebase.auth.ktx.auth +import com.google.firebase.auth.auth import com.google.firebase.functions.FirebaseFunctions import com.google.firebase.functions.FirebaseFunctionsException -import com.google.firebase.functions.ktx.functions -import com.google.firebase.ktx.Firebase +import com.google.firebase.functions.functions +import com.google.firebase.Firebase import com.google.samples.quickstart.functions.R import com.google.samples.quickstart.functions.databinding.ActivityMainBinding 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 024f05749d..59645c6808 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.analytics.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.ktx.inAppMessaging -import com.google.firebase.installations.ktx.installations -import com.google.firebase.ktx.Firebase +import com.google.firebase.inappmessaging.inAppMessaging +import com.google.firebase.installations.installations +import com.google.firebase.Firebase class KotlinMainActivity : AppCompatActivity() { diff --git a/messaging/app/src/main/java/com/google/firebase/quickstart/fcm/kotlin/MainActivity.kt b/messaging/app/src/main/java/com/google/firebase/quickstart/fcm/kotlin/MainActivity.kt index 37afe87b53..ff5a0bc598 100644 --- a/messaging/app/src/main/java/com/google/firebase/quickstart/fcm/kotlin/MainActivity.kt +++ b/messaging/app/src/main/java/com/google/firebase/quickstart/fcm/kotlin/MainActivity.kt @@ -12,8 +12,8 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import com.google.android.gms.tasks.OnCompleteListener -import com.google.firebase.ktx.Firebase -import com.google.firebase.messaging.ktx.messaging +import com.google.firebase.Firebase +import com.google.firebase.messaging.messaging import com.google.firebase.quickstart.fcm.R import com.google.firebase.quickstart.fcm.databinding.ActivityMainBinding diff --git a/perf/app/src/main/java/com/google/firebase/quickstart/perfmon/kotlin/MainActivity.kt b/perf/app/src/main/java/com/google/firebase/quickstart/perfmon/kotlin/MainActivity.kt index c376c32b85..89d0a18c4a 100644 --- a/perf/app/src/main/java/com/google/firebase/quickstart/perfmon/kotlin/MainActivity.kt +++ b/perf/app/src/main/java/com/google/firebase/quickstart/perfmon/kotlin/MainActivity.kt @@ -16,8 +16,8 @@ import com.bumptech.glide.request.target.Target import com.google.android.gms.tasks.OnCompleteListener import com.google.android.gms.tasks.Task import com.google.android.gms.tasks.TaskCompletionSource -import com.google.firebase.ktx.Firebase -import com.google.firebase.perf.ktx.performance +import com.google.firebase.Firebase +import com.google.firebase.perf.performance import com.google.firebase.perf.metrics.Trace import com.google.firebase.quickstart.perfmon.R import com.google.firebase.quickstart.perfmon.databinding.ActivityMainBinding diff --git a/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MainActivity.kt b/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MainActivity.kt index 4e15c1fab2..ea973e3a15 100644 --- a/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MainActivity.kt +++ b/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MainActivity.kt @@ -21,8 +21,8 @@ import androidx.core.content.ContextCompat import androidx.localbroadcastmanager.content.LocalBroadcastManager import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser -import com.google.firebase.auth.ktx.auth -import com.google.firebase.ktx.Firebase +import com.google.firebase.auth.auth +import com.google.firebase.Firebase import com.google.firebase.quickstart.firebasestorage.R import com.google.firebase.quickstart.firebasestorage.databinding.ActivityMainBinding import java.util.Locale diff --git a/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MyDownloadService.kt b/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MyDownloadService.kt index e41428359c..99cd4f304a 100644 --- a/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MyDownloadService.kt +++ b/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MyDownloadService.kt @@ -6,12 +6,12 @@ import android.content.IntentFilter import android.os.IBinder import android.util.Log import androidx.localbroadcastmanager.content.LocalBroadcastManager -import com.google.firebase.ktx.Firebase +import com.google.firebase.Firebase import com.google.firebase.quickstart.firebasestorage.R import com.google.firebase.storage.StorageReference -import com.google.firebase.storage.ktx.component1 -import com.google.firebase.storage.ktx.component2 -import com.google.firebase.storage.ktx.storage +import com.google.firebase.storage.component1 +import com.google.firebase.storage.component2 +import com.google.firebase.storage.storage class MyDownloadService : MyBaseTaskService() { diff --git a/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MyUploadService.kt b/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MyUploadService.kt index 92d4d3f921..3e87488aaa 100644 --- a/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MyUploadService.kt +++ b/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MyUploadService.kt @@ -7,12 +7,12 @@ import android.os.Build import android.os.IBinder import android.util.Log import androidx.localbroadcastmanager.content.LocalBroadcastManager -import com.google.firebase.ktx.Firebase +import com.google.firebase.Firebase import com.google.firebase.quickstart.firebasestorage.R import com.google.firebase.storage.StorageReference -import com.google.firebase.storage.ktx.component1 -import com.google.firebase.storage.ktx.component2 -import com.google.firebase.storage.ktx.storage +import com.google.firebase.storage.component1 +import com.google.firebase.storage.component2 +import com.google.firebase.storage.storage /** * Service to handle uploading files to Firebase Storage. From ca69661e545032efb03ee7404633bce59b323598 Mon Sep 17 00:00:00 2001 From: DPE bot Date: Wed, 18 Oct 2023 18:30:46 -0400 Subject: [PATCH 2/8] Auto-update dependencies. --- admob/app/build.gradle.kts | 2 +- analytics/app/build.gradle.kts | 2 +- appdistribution/app/build.gradle.kts | 2 +- auth/app/build.gradle.kts | 2 +- build.gradle.kts | 2 +- config/app/build.gradle.kts | 2 +- crash/app/build.gradle.kts | 2 +- database/app/build.gradle.kts | 4 ++-- dynamiclinks/app/build.gradle.kts | 2 +- firestore/app/build.gradle.kts | 4 ++-- functions/app/build.gradle.kts | 2 +- inappmessaging/app/build.gradle.kts | 4 ++-- internal/chooserx/build.gradle.kts | 2 +- messaging/app/build.gradle.kts | 4 ++-- perf/app/build.gradle.kts | 2 +- storage/app/build.gradle.kts | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/admob/app/build.gradle.kts b/admob/app/build.gradle.kts index e834747ac3..0ed7c3f8cf 100644 --- a/admob/app/build.gradle.kts +++ b/admob/app/build.gradle.kts @@ -58,7 +58,7 @@ dependencies { implementation("com.google.android.gms:play-services-ads:22.4.0") // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // For an optimal experience using AdMob, add the Firebase SDK // for Google Analytics. This is recommended, but not required. diff --git a/analytics/app/build.gradle.kts b/analytics/app/build.gradle.kts index 2ff09cf348..0003394408 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.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Firebase Analytics (Java) implementation("com.google.firebase:firebase-analytics") diff --git a/appdistribution/app/build.gradle.kts b/appdistribution/app/build.gradle.kts index cd6cd6954c..804f4c9086 100644 --- a/appdistribution/app/build.gradle.kts +++ b/appdistribution/app/build.gradle.kts @@ -53,7 +53,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.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // ADD the SDK to the "prerelease" variant only (example) implementation("com.google.firebase:firebase-appdistribution-ktx:16.0.0-beta02") diff --git a/auth/app/build.gradle.kts b/auth/app/build.gradle.kts index 2859e3ad39..7de0bf03c8 100644 --- a/auth/app/build.gradle.kts +++ b/auth/app/build.gradle.kts @@ -59,7 +59,7 @@ dependencies { implementation("androidx.navigation:navigation-ui-ktx:2.7.4") // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Firebase Authentication (Java) implementation("com.google.firebase:firebase-auth") diff --git a/build.gradle.kts b/build.gradle.kts index 0f88071d6d..c4cb7af05f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ allprojects { val ktlint by configurations.creating dependencies { - ktlint("com.pinterest:ktlint:0.49.1") { + ktlint("com.pinterest:ktlint:0.51.0-FINAL") { attributes { attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL)) } diff --git a/config/app/build.gradle.kts b/config/app/build.gradle.kts index 40fc57f198..84112eada4 100644 --- a/config/app/build.gradle.kts +++ b/config/app/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { implementation("com.google.android.material:material:1.9.0") // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Firebase Remote Config (Java) implementation("com.google.firebase:firebase-config") diff --git a/crash/app/build.gradle.kts b/crash/app/build.gradle.kts index f98e66c0a0..9074c4d96c 100644 --- a/crash/app/build.gradle.kts +++ b/crash/app/build.gradle.kts @@ -56,7 +56,7 @@ dependencies { implementation("androidx.activity:activity-ktx:1.8.0") // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Firebase Crashlytics (Kotlin) implementation("com.google.firebase:firebase-crashlytics-ktx") diff --git a/database/app/build.gradle.kts b/database/app/build.gradle.kts index e0f14daf56..7d8819612f 100644 --- a/database/app/build.gradle.kts +++ b/database/app/build.gradle.kts @@ -49,13 +49,13 @@ dependencies { implementation(project(":internal:chooserx")) implementation("androidx.appcompat:appcompat:1.6.1") - implementation("androidx.recyclerview:recyclerview:1.3.1") + implementation("androidx.recyclerview:recyclerview:1.3.2") implementation("com.google.android.material:material:1.9.0") implementation("androidx.navigation:navigation-fragment-ktx:2.7.4") implementation("androidx.navigation:navigation-ui-ktx:2.7.4") // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Firebase Realtime Database (Java) implementation("com.google.firebase:firebase-database") diff --git a/dynamiclinks/app/build.gradle.kts b/dynamiclinks/app/build.gradle.kts index 260e9f2db8..9fe9ff3b7c 100644 --- a/dynamiclinks/app/build.gradle.kts +++ b/dynamiclinks/app/build.gradle.kts @@ -62,7 +62,7 @@ dependencies { implementation("com.google.android.material:material:1.9.0") // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Firebase Dynamic Links (Java) implementation("com.google.firebase:firebase-dynamic-links") diff --git a/firestore/app/build.gradle.kts b/firestore/app/build.gradle.kts index 6d444d9560..941e245fda 100644 --- a/firestore/app/build.gradle.kts +++ b/firestore/app/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { implementation(project(":internal:chooserx")) // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Firestore (Java) implementation("com.google.firebase:firebase-firestore") @@ -83,7 +83,7 @@ dependencies { implementation("androidx.browser:browser:1.5.0") implementation("com.google.android.material:material:1.9.0") implementation("androidx.media:media:1.6.0") - implementation("androidx.recyclerview:recyclerview:1.3.1") + implementation("androidx.recyclerview:recyclerview:1.3.2") implementation("androidx.multidex:multidex:2.0.1") implementation("androidx.navigation:navigation-fragment-ktx:2.7.4") implementation("androidx.navigation:navigation-ui-ktx:2.7.4") diff --git a/functions/app/build.gradle.kts b/functions/app/build.gradle.kts index 537153dd4b..c98e6c8621 100644 --- a/functions/app/build.gradle.kts +++ b/functions/app/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { implementation("com.google.android.material:material:1.9.0") // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Cloud Functions for Firebase (Java) implementation("com.google.firebase:firebase-functions") diff --git a/inappmessaging/app/build.gradle.kts b/inappmessaging/app/build.gradle.kts index 78b21d5f6d..e38c2de913 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.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // FIAM (Java) implementation("com.google.firebase:firebase-inappmessaging-display") @@ -67,7 +67,7 @@ dependencies { // Analytics (Kotlin) implementation("com.google.firebase:firebase-analytics-ktx") - implementation("com.google.firebase:firebase-installations-ktx:17.1.4") + implementation("com.google.firebase:firebase-installations-ktx:17.2.0") androidTestImplementation("androidx.test:runner:1.5.2") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") diff --git a/internal/chooserx/build.gradle.kts b/internal/chooserx/build.gradle.kts index 1984c78c46..a426d3b68d 100755 --- a/internal/chooserx/build.gradle.kts +++ b/internal/chooserx/build.gradle.kts @@ -24,6 +24,6 @@ android { dependencies { api("com.google.android.material:material:1.9.0") - api("androidx.recyclerview:recyclerview:1.3.1") + api("androidx.recyclerview:recyclerview:1.3.2") api("androidx.constraintlayout:constraintlayout:2.1.4") } diff --git a/messaging/app/build.gradle.kts b/messaging/app/build.gradle.kts index 7fe09ebbf3..575eb55cd2 100644 --- a/messaging/app/build.gradle.kts +++ b/messaging/app/build.gradle.kts @@ -64,7 +64,7 @@ dependencies { implementation("com.google.android.material:material:1.9.0") // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Firebase Cloud Messaging (Java) implementation("com.google.firebase:firebase-messaging") @@ -76,7 +76,7 @@ dependencies { // for Google Analytics. This is recommended, but not required. implementation("com.google.firebase:firebase-analytics") - implementation("com.google.firebase:firebase-installations-ktx:17.1.4") + implementation("com.google.firebase:firebase-installations-ktx:17.2.0") implementation("androidx.work:work-runtime:2.8.1") diff --git a/perf/app/build.gradle.kts b/perf/app/build.gradle.kts index ab1d7f3033..310ad4e9e1 100644 --- a/perf/app/build.gradle.kts +++ b/perf/app/build.gradle.kts @@ -61,7 +61,7 @@ dependencies { implementation(project(":internal:chooserx")) // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Firebase Performance Monitoring (Java) implementation("com.google.firebase:firebase-perf") diff --git a/storage/app/build.gradle.kts b/storage/app/build.gradle.kts index 6a2bc16727..8452c99d96 100644 --- a/storage/app/build.gradle.kts +++ b/storage/app/build.gradle.kts @@ -48,7 +48,7 @@ dependencies { implementation(project(":internal:chooserx")) // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation(platform("com.google.firebase:firebase-bom:32.3.1")) + implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Cloud Storage for Firebase (Java) implementation("com.google.firebase:firebase-storage") From 090f397afcdfe8babac6356942e2a0bdb15a4631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ros=C3=A1rio=20P=2E=20Fernandes?= Date: Thu, 19 Oct 2023 11:29:32 +0100 Subject: [PATCH 3/8] keep ktlint version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index c4cb7af05f..0f88071d6d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ allprojects { val ktlint by configurations.creating dependencies { - ktlint("com.pinterest:ktlint:0.51.0-FINAL") { + ktlint("com.pinterest:ktlint:0.49.1") { attributes { attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL)) } From 873365fbb40362e7174dc8158c4ae2e254a5356f Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 19 Oct 2023 11:55:19 +0100 Subject: [PATCH 4/8] refactor(*): remove ktx dependencies --- analytics/app/build.gradle.kts | 2 +- appdistribution/app/build.gradle.kts | 2 +- auth/app/build.gradle.kts | 2 +- config/app/build.gradle.kts | 2 +- crash/app/build.gradle.kts | 2 +- database/app/build.gradle.kts | 4 ++-- dynamiclinks/app/build.gradle.kts | 2 +- firestore/app/build.gradle.kts | 4 ++-- functions/app/build.gradle.kts | 4 ++-- inappmessaging/app/build.gradle.kts | 6 +++--- messaging/app/build.gradle.kts | 4 ++-- perf/app/build.gradle.kts | 2 +- storage/app/build.gradle.kts | 4 ++-- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/analytics/app/build.gradle.kts b/analytics/app/build.gradle.kts index 0003394408..3983c79795 100644 --- a/analytics/app/build.gradle.kts +++ b/analytics/app/build.gradle.kts @@ -62,7 +62,7 @@ dependencies { implementation("com.google.firebase:firebase-analytics") // Firebase Analytics (Kotlin) - implementation("com.google.firebase:firebase-analytics-ktx") + implementation("com.google.firebase:firebase-analytics") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") androidTestImplementation("androidx.test:rules:1.5.0") diff --git a/appdistribution/app/build.gradle.kts b/appdistribution/app/build.gradle.kts index 804f4c9086..f59d8166b9 100644 --- a/appdistribution/app/build.gradle.kts +++ b/appdistribution/app/build.gradle.kts @@ -56,7 +56,7 @@ dependencies { implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // ADD the SDK to the "prerelease" variant only (example) - implementation("com.google.firebase:firebase-appdistribution-ktx:16.0.0-beta02") + implementation("com.google.firebase:firebase-appdistribution:16.0.0-beta02") // For an optimal experience using App Distribution, add the Firebase SDK // for Google Analytics. This is recommended, but not required. diff --git a/auth/app/build.gradle.kts b/auth/app/build.gradle.kts index 7de0bf03c8..fc8a0436b6 100644 --- a/auth/app/build.gradle.kts +++ b/auth/app/build.gradle.kts @@ -65,7 +65,7 @@ dependencies { implementation("com.google.firebase:firebase-auth") // Firebase Authentication (Kotlin) - implementation("com.google.firebase:firebase-auth-ktx") + implementation("com.google.firebase:firebase-auth") // Google Identity Services SDK (only required for Auth with Google) implementation("com.google.android.gms:play-services-auth:20.7.0") diff --git a/config/app/build.gradle.kts b/config/app/build.gradle.kts index 84112eada4..0d77f145b5 100644 --- a/config/app/build.gradle.kts +++ b/config/app/build.gradle.kts @@ -56,7 +56,7 @@ dependencies { implementation("com.google.firebase:firebase-config") // Firebase Remote Config (Kotlin) - implementation("com.google.firebase:firebase-config-ktx") + implementation("com.google.firebase:firebase-config") // For an optimal experience using Remote Config, add the Firebase SDK // for Google Analytics. This is recommended, but not required. diff --git a/crash/app/build.gradle.kts b/crash/app/build.gradle.kts index 9074c4d96c..64a2b5ef53 100644 --- a/crash/app/build.gradle.kts +++ b/crash/app/build.gradle.kts @@ -59,7 +59,7 @@ dependencies { implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // Firebase Crashlytics (Kotlin) - implementation("com.google.firebase:firebase-crashlytics-ktx") + implementation("com.google.firebase:firebase-crashlytics") // For an optimal experience using Crashlytics, add the Firebase SDK // for Google Analytics. This is recommended, but not required. diff --git a/database/app/build.gradle.kts b/database/app/build.gradle.kts index 7d8819612f..fe9ead6ac1 100644 --- a/database/app/build.gradle.kts +++ b/database/app/build.gradle.kts @@ -61,13 +61,13 @@ dependencies { implementation("com.google.firebase:firebase-database") // Firebase Realtime Database (Kotlin) - implementation("com.google.firebase:firebase-database-ktx") + implementation("com.google.firebase:firebase-database") // Firebase Authentication (Java) implementation("com.google.firebase:firebase-auth") // Firebase Authentication (Kotlin) - implementation("com.google.firebase:firebase-auth-ktx") + implementation("com.google.firebase:firebase-auth") implementation("com.firebaseui:firebase-ui-database:8.0.2") diff --git a/dynamiclinks/app/build.gradle.kts b/dynamiclinks/app/build.gradle.kts index 9fe9ff3b7c..dffc3f679f 100644 --- a/dynamiclinks/app/build.gradle.kts +++ b/dynamiclinks/app/build.gradle.kts @@ -68,7 +68,7 @@ dependencies { implementation("com.google.firebase:firebase-dynamic-links") // Firebase Dynamic Links (Kotlin) - implementation("com.google.firebase:firebase-dynamic-links-ktx") + implementation("com.google.firebase:firebase-dynamic-links") // For an optimal experience using Dynamic Links, add the Firebase SDK // for Google Analytics. This is recommended, but not required. diff --git a/firestore/app/build.gradle.kts b/firestore/app/build.gradle.kts index 941e245fda..8dffe5fc15 100644 --- a/firestore/app/build.gradle.kts +++ b/firestore/app/build.gradle.kts @@ -60,13 +60,13 @@ dependencies { implementation("com.google.firebase:firebase-firestore") // Firestore (Kotlin) - implementation("com.google.firebase:firebase-firestore-ktx") + implementation("com.google.firebase:firebase-firestore") // Firebase Authentication (Java) implementation("com.google.firebase:firebase-auth") // Firebase Authentication (Kotlin) - implementation("com.google.firebase:firebase-auth-ktx") + implementation("com.google.firebase:firebase-auth") // Google Play services implementation("com.google.android.gms:play-services-auth:20.7.0") diff --git a/functions/app/build.gradle.kts b/functions/app/build.gradle.kts index c98e6c8621..9e455dab04 100644 --- a/functions/app/build.gradle.kts +++ b/functions/app/build.gradle.kts @@ -57,13 +57,13 @@ dependencies { implementation("com.google.firebase:firebase-functions") // Cloud Functions for Firebase (Kotlin) - implementation("com.google.firebase:firebase-functions-ktx") + implementation("com.google.firebase:firebase-functions") // Firebase Authentication (Java) implementation("com.google.firebase:firebase-auth") // Firebase Authentication (Kotlin) - implementation("com.google.firebase:firebase-auth-ktx") + implementation("com.google.firebase:firebase-auth") // Firebase Cloud Messaging implementation("com.google.firebase:firebase-messaging") diff --git a/inappmessaging/app/build.gradle.kts b/inappmessaging/app/build.gradle.kts index e38c2de913..c53473c205 100644 --- a/inappmessaging/app/build.gradle.kts +++ b/inappmessaging/app/build.gradle.kts @@ -58,16 +58,16 @@ dependencies { implementation("com.google.firebase:firebase-inappmessaging-display") // FIAM (Kotlin) - implementation("com.google.firebase:firebase-inappmessaging-display-ktx") + implementation("com.google.firebase:firebase-inappmessaging-display") // The Firebase SDK for Google Analytics is required to use In-App Messaging // Analytics (Java) implementation("com.google.firebase:firebase-analytics") // Analytics (Kotlin) - implementation("com.google.firebase:firebase-analytics-ktx") + implementation("com.google.firebase:firebase-analytics") - implementation("com.google.firebase:firebase-installations-ktx:17.2.0") + implementation("com.google.firebase:firebase-installations:17.2.0") androidTestImplementation("androidx.test:runner:1.5.2") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") diff --git a/messaging/app/build.gradle.kts b/messaging/app/build.gradle.kts index 575eb55cd2..d61d9a0ff5 100644 --- a/messaging/app/build.gradle.kts +++ b/messaging/app/build.gradle.kts @@ -70,13 +70,13 @@ dependencies { implementation("com.google.firebase:firebase-messaging") // Firebase Cloud Messaging (Kotlin) - implementation("com.google.firebase:firebase-messaging-ktx") + implementation("com.google.firebase:firebase-messaging") // For an optimal experience using FCM, add the Firebase SDK // for Google Analytics. This is recommended, but not required. implementation("com.google.firebase:firebase-analytics") - implementation("com.google.firebase:firebase-installations-ktx:17.2.0") + implementation("com.google.firebase:firebase-installations:17.2.0") implementation("androidx.work:work-runtime:2.8.1") diff --git a/perf/app/build.gradle.kts b/perf/app/build.gradle.kts index 310ad4e9e1..46f6a872c8 100644 --- a/perf/app/build.gradle.kts +++ b/perf/app/build.gradle.kts @@ -67,7 +67,7 @@ dependencies { implementation("com.google.firebase:firebase-perf") // Firebase Performance Monitoring (Kotlin) - implementation("com.google.firebase:firebase-perf-ktx") + implementation("com.google.firebase:firebase-perf") implementation("com.google.android.material:material:1.9.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") diff --git a/storage/app/build.gradle.kts b/storage/app/build.gradle.kts index 8452c99d96..17c85437ba 100644 --- a/storage/app/build.gradle.kts +++ b/storage/app/build.gradle.kts @@ -54,13 +54,13 @@ dependencies { implementation("com.google.firebase:firebase-storage") // Cloud Storage for Firebase (Kotlin) - implementation("com.google.firebase:firebase-storage-ktx") + implementation("com.google.firebase:firebase-storage") // Firebase Authentication (Java) implementation("com.google.firebase:firebase-auth") // Firebase Authentication (Kotlin) - implementation("com.google.firebase:firebase-auth-ktx") + implementation("com.google.firebase:firebase-auth") implementation("androidx.activity:activity-ktx:1.8.0") implementation("androidx.appcompat:appcompat:1.6.1") From 336adc03eb7a859a2aa28f6ef63e52e6fedce45a Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 19 Oct 2023 11:58:39 +0100 Subject: [PATCH 5/8] refactor(*): remove duplicate dependencies --- analytics/app/build.gradle.kts | 5 +---- auth/app/build.gradle.kts | 5 +---- config/app/build.gradle.kts | 5 +---- crash/app/build.gradle.kts | 2 +- database/app/build.gradle.kts | 10 ++-------- dynamiclinks/app/build.gradle.kts | 5 +---- firestore/app/build.gradle.kts | 10 ++-------- functions/app/build.gradle.kts | 10 ++-------- inappmessaging/app/build.gradle.kts | 10 ++-------- messaging/app/build.gradle.kts | 5 +---- perf/app/build.gradle.kts | 5 +---- storage/app/build.gradle.kts | 10 ++-------- 12 files changed, 17 insertions(+), 65 deletions(-) diff --git a/analytics/app/build.gradle.kts b/analytics/app/build.gradle.kts index 3983c79795..91c2e869a4 100644 --- a/analytics/app/build.gradle.kts +++ b/analytics/app/build.gradle.kts @@ -58,10 +58,7 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // Firebase Analytics (Java) - implementation("com.google.firebase:firebase-analytics") - - // Firebase Analytics (Kotlin) + // Firebase Analytics implementation("com.google.firebase:firebase-analytics") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") diff --git a/auth/app/build.gradle.kts b/auth/app/build.gradle.kts index fc8a0436b6..03eea6baec 100644 --- a/auth/app/build.gradle.kts +++ b/auth/app/build.gradle.kts @@ -61,10 +61,7 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // Firebase Authentication (Java) - implementation("com.google.firebase:firebase-auth") - - // Firebase Authentication (Kotlin) + // Firebase Authentication implementation("com.google.firebase:firebase-auth") // Google Identity Services SDK (only required for Auth with Google) diff --git a/config/app/build.gradle.kts b/config/app/build.gradle.kts index 0d77f145b5..7257b3cccc 100644 --- a/config/app/build.gradle.kts +++ b/config/app/build.gradle.kts @@ -52,10 +52,7 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // Firebase Remote Config (Java) - implementation("com.google.firebase:firebase-config") - - // Firebase Remote Config (Kotlin) + // Firebase Remote Config implementation("com.google.firebase:firebase-config") // For an optimal experience using Remote Config, add the Firebase SDK diff --git a/crash/app/build.gradle.kts b/crash/app/build.gradle.kts index 64a2b5ef53..e70a8b8e34 100644 --- a/crash/app/build.gradle.kts +++ b/crash/app/build.gradle.kts @@ -58,7 +58,7 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // Firebase Crashlytics (Kotlin) + // Firebase Crashlytics implementation("com.google.firebase:firebase-crashlytics") // For an optimal experience using Crashlytics, add the Firebase SDK diff --git a/database/app/build.gradle.kts b/database/app/build.gradle.kts index fe9ead6ac1..85c6670221 100644 --- a/database/app/build.gradle.kts +++ b/database/app/build.gradle.kts @@ -57,16 +57,10 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // Firebase Realtime Database (Java) + // Firebase Realtime Database implementation("com.google.firebase:firebase-database") - // Firebase Realtime Database (Kotlin) - implementation("com.google.firebase:firebase-database") - - // Firebase Authentication (Java) - implementation("com.google.firebase:firebase-auth") - - // Firebase Authentication (Kotlin) + // Firebase Authentication implementation("com.google.firebase:firebase-auth") implementation("com.firebaseui:firebase-ui-database:8.0.2") diff --git a/dynamiclinks/app/build.gradle.kts b/dynamiclinks/app/build.gradle.kts index dffc3f679f..ddb7eba4a8 100644 --- a/dynamiclinks/app/build.gradle.kts +++ b/dynamiclinks/app/build.gradle.kts @@ -64,10 +64,7 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // Firebase Dynamic Links (Java) - implementation("com.google.firebase:firebase-dynamic-links") - - // Firebase Dynamic Links (Kotlin) + // Firebase Dynamic Links implementation("com.google.firebase:firebase-dynamic-links") // For an optimal experience using Dynamic Links, add the Firebase SDK diff --git a/firestore/app/build.gradle.kts b/firestore/app/build.gradle.kts index 8dffe5fc15..a33c5162c0 100644 --- a/firestore/app/build.gradle.kts +++ b/firestore/app/build.gradle.kts @@ -56,16 +56,10 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // Firestore (Java) + // Firestore implementation("com.google.firebase:firebase-firestore") - // Firestore (Kotlin) - implementation("com.google.firebase:firebase-firestore") - - // Firebase Authentication (Java) - implementation("com.google.firebase:firebase-auth") - - // Firebase Authentication (Kotlin) + // Firebase Authentication implementation("com.google.firebase:firebase-auth") // Google Play services diff --git a/functions/app/build.gradle.kts b/functions/app/build.gradle.kts index 9e455dab04..39c13e792e 100644 --- a/functions/app/build.gradle.kts +++ b/functions/app/build.gradle.kts @@ -53,16 +53,10 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // Cloud Functions for Firebase (Java) + // Cloud Functions for Firebase implementation("com.google.firebase:firebase-functions") - // Cloud Functions for Firebase (Kotlin) - implementation("com.google.firebase:firebase-functions") - - // Firebase Authentication (Java) - implementation("com.google.firebase:firebase-auth") - - // Firebase Authentication (Kotlin) + // Firebase Authentication implementation("com.google.firebase:firebase-auth") // Firebase Cloud Messaging diff --git a/inappmessaging/app/build.gradle.kts b/inappmessaging/app/build.gradle.kts index c53473c205..d2c3de6a0e 100644 --- a/inappmessaging/app/build.gradle.kts +++ b/inappmessaging/app/build.gradle.kts @@ -54,17 +54,11 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // FIAM (Java) - implementation("com.google.firebase:firebase-inappmessaging-display") - - // FIAM (Kotlin) + // FIAM implementation("com.google.firebase:firebase-inappmessaging-display") // The Firebase SDK for Google Analytics is required to use In-App Messaging - // Analytics (Java) - implementation("com.google.firebase:firebase-analytics") - - // Analytics (Kotlin) + // Analytics implementation("com.google.firebase:firebase-analytics") implementation("com.google.firebase:firebase-installations:17.2.0") diff --git a/messaging/app/build.gradle.kts b/messaging/app/build.gradle.kts index d61d9a0ff5..5642cebba0 100644 --- a/messaging/app/build.gradle.kts +++ b/messaging/app/build.gradle.kts @@ -66,10 +66,7 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // Firebase Cloud Messaging (Java) - implementation("com.google.firebase:firebase-messaging") - - // Firebase Cloud Messaging (Kotlin) + // Firebase Cloud Messaging implementation("com.google.firebase:firebase-messaging") // For an optimal experience using FCM, add the Firebase SDK diff --git a/perf/app/build.gradle.kts b/perf/app/build.gradle.kts index 46f6a872c8..ef44959fb1 100644 --- a/perf/app/build.gradle.kts +++ b/perf/app/build.gradle.kts @@ -63,10 +63,7 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // Firebase Performance Monitoring (Java) - implementation("com.google.firebase:firebase-perf") - - // Firebase Performance Monitoring (Kotlin) + // Firebase Performance Monitoring implementation("com.google.firebase:firebase-perf") implementation("com.google.android.material:material:1.9.0") diff --git a/storage/app/build.gradle.kts b/storage/app/build.gradle.kts index 17c85437ba..2499cfdd96 100644 --- a/storage/app/build.gradle.kts +++ b/storage/app/build.gradle.kts @@ -50,16 +50,10 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation(platform("com.google.firebase:firebase-bom:32.4.0")) - // Cloud Storage for Firebase (Java) + // Cloud Storage for Firebase implementation("com.google.firebase:firebase-storage") - // Cloud Storage for Firebase (Kotlin) - implementation("com.google.firebase:firebase-storage") - - // Firebase Authentication (Java) - implementation("com.google.firebase:firebase-auth") - - // Firebase Authentication (Kotlin) + // Firebase Authentication implementation("com.google.firebase:firebase-auth") implementation("androidx.activity:activity-ktx:1.8.0") From 3f01b1a5c3262f3e9d7cfdd62d70ebe4f4f59b70 Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 19 Oct 2023 12:22:14 +0100 Subject: [PATCH 6/8] refactor(analytics, fiam): revert ktx imports --- .../firebase/quickstart/analytics/kotlin/MainActivity.kt | 6 +++--- .../firebase/fiamquickstart/kotlin/KotlinMainActivity.kt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 059338e241..1ce5d929f3 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 @@ -16,9 +16,9 @@ import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator import com.google.firebase.analytics.FirebaseAnalytics -import com.google.firebase.analytics.analytics -import com.google.firebase.analytics.logEvent -import com.google.firebase.Firebase +import com.google.firebase.analytics.ktx.analytics +import com.google.firebase.analytics.ktx.logEvent +import com.google.firebase.ktx.Firebase 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/src/main/java/com/google/firebase/fiamquickstart/kotlin/KotlinMainActivity.kt b/inappmessaging/app/src/main/java/com/google/firebase/fiamquickstart/kotlin/KotlinMainActivity.kt index 59645c6808..4da4e0ee98 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,7 +5,7 @@ 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.analytics +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 @@ -23,7 +23,7 @@ class KotlinMainActivity : AppCompatActivity() { val binding = ActivityMainBinding.inflate(layoutInflater) setContentView(binding.root) - firebaseAnalytics = Firebase.analytics + firebaseAnalytics = com.google.firebase.ktx.Firebase.analytics firebaseIam = Firebase.inAppMessaging firebaseIam.isAutomaticDataCollectionEnabled = true From 2da75c6c3a83c1e7b09bc52f670ca2ca4f56ce8b Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 19 Oct 2023 12:31:23 +0100 Subject: [PATCH 7/8] chore(fad): update appdistribution to beta11 --- appdistribution/app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appdistribution/app/build.gradle.kts b/appdistribution/app/build.gradle.kts index f59d8166b9..b19c20bd83 100644 --- a/appdistribution/app/build.gradle.kts +++ b/appdistribution/app/build.gradle.kts @@ -56,7 +56,7 @@ dependencies { implementation(platform("com.google.firebase:firebase-bom:32.4.0")) // ADD the SDK to the "prerelease" variant only (example) - implementation("com.google.firebase:firebase-appdistribution:16.0.0-beta02") + implementation("com.google.firebase:firebase-appdistribution:16.0.0-beta11") // For an optimal experience using App Distribution, add the Firebase SDK // for Google Analytics. This is recommended, but not required. From b8454b34e8f9cf48bfb0d408f50e3aefd3a35313 Mon Sep 17 00:00:00 2001 From: rosariopf Date: Thu, 19 Oct 2023 13:14:50 +0100 Subject: [PATCH 8/8] fix workmanager error --- messaging/app/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/messaging/app/build.gradle.kts b/messaging/app/build.gradle.kts index 5642cebba0..00d5a71c0a 100644 --- a/messaging/app/build.gradle.kts +++ b/messaging/app/build.gradle.kts @@ -77,6 +77,10 @@ dependencies { implementation("androidx.work:work-runtime:2.8.1") + // Needed to fix the error: + // Cannot access class 'com.google.common.util.concurrent.ListenableFuture' + implementation("com.google.guava:guava:32.1.3-android") + // Testing dependencies androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") androidTestImplementation("androidx.test:runner:1.5.2")