Skip to content

Commit 5658359

Browse files
committed
Update Firebase dependencies
1 parent 3f63c14 commit 5658359

File tree

8 files changed

+20
-19
lines changed

8 files changed

+20
-19
lines changed

flavor-google/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
alias(libs.plugins.android.library)
33
alias(libs.plugins.kotlin.android)
44
alias(libs.plugins.kotlin.kapt)
5+
alias(libs.plugins.ksp)
56
alias(libs.plugins.hilt)
67
}
78

@@ -23,7 +24,7 @@ dependencies {
2324
kapt libs.hilt.compiler
2425
implementation libs.hilt.navigation
2526
implementation libs.hilt.work
26-
kapt libs.hilt.work.compiler
27+
ksp libs.hilt.work.compiler
2728

2829
implementation libs.billing
2930

flavor-google/src/main/java/xyz/aprildown/timer/app/analytics/AppTrackerImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package xyz.aprildown.timer.app.analytics
22

33
import android.content.Context
4-
import com.google.firebase.crashlytics.ktx.crashlytics
5-
import com.google.firebase.ktx.Firebase
4+
import com.google.firebase.Firebase
5+
import com.google.firebase.crashlytics.crashlytics
66
import dagger.Reusable
77
import xyz.aprildown.timer.domain.utils.AppTracker
88
import javax.inject.Inject

flavor-google/src/main/java/xyz/aprildown/timer/flavor/google/backup/CloudBackupFragment.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.lifecycle.LifecycleOwner
2020
import androidx.lifecycle.lifecycleScope
2121
import androidx.navigation.fragment.findNavController
2222
import androidx.preference.Preference
23-
import androidx.preference.PreferenceFragmentCompat
2423
import androidx.preference.SwitchPreferenceCompat
2524
import com.github.deweyreed.tools.anko.longSnackbar
2625
import com.github.deweyreed.tools.anko.newTask
@@ -32,15 +31,16 @@ import com.github.deweyreed.tools.helper.startActivityOrNothing
3231
import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption
3332
import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
3433
import com.google.android.material.dialog.MaterialAlertDialogBuilder
34+
import com.google.firebase.Firebase
3535
import com.google.firebase.auth.GoogleAuthProvider
36-
import com.google.firebase.auth.ktx.auth
37-
import com.google.firebase.ktx.Firebase
38-
import com.google.firebase.storage.ktx.storage
36+
import com.google.firebase.auth.auth
37+
import com.google.firebase.storage.storage
3938
import dagger.hilt.android.AndroidEntryPoint
4039
import kotlinx.coroutines.ensureActive
4140
import kotlinx.coroutines.launch
4241
import kotlinx.coroutines.tasks.await
4342
import xyz.aprildown.timer.app.base.data.FlavorData
43+
import xyz.aprildown.timer.app.base.ui.BasePreferenceFragmentCompat
4444
import xyz.aprildown.timer.app.base.utils.NavigationUtils.subLevelNavigate
4545
import xyz.aprildown.timer.domain.usecases.Fruit
4646
import xyz.aprildown.timer.flavor.google.BillingActivity
@@ -59,7 +59,7 @@ import javax.inject.Inject
5959
import xyz.aprildown.timer.app.base.R as RBase
6060

6161
@AndroidEntryPoint
62-
internal class CloudBackupFragment : PreferenceFragmentCompat() {
62+
internal class CloudBackupFragment : BasePreferenceFragmentCompat() {
6363

6464
private val viewModel by hiltNavGraphViewModels<CloudBackupViewModel>(RBase.id.dest_cloud_backup)
6565

flavor-google/src/main/java/xyz/aprildown/timer/flavor/google/backup/CloudBackupViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import androidx.lifecycle.liveData
88
import androidx.lifecycle.switchMap
99
import com.github.deweyreed.tools.arch.Event
1010
import com.github.deweyreed.tools.arch.EventObserver
11-
import com.google.firebase.auth.ktx.auth
12-
import com.google.firebase.ktx.Firebase
11+
import com.google.firebase.Firebase
12+
import com.google.firebase.auth.auth
1313
import com.google.firebase.storage.StorageMetadata
1414
import com.google.firebase.storage.StorageReference
1515
import dagger.Lazy

flavor-google/src/main/java/xyz/aprildown/timer/flavor/google/backup/CloudBackupWorker.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import androidx.lifecycle.Observer
88
import androidx.work.CoroutineWorker
99
import androidx.work.WorkerParameters
1010
import com.github.deweyreed.tools.arch.Event
11-
import com.google.firebase.auth.ktx.auth
12-
import com.google.firebase.ktx.Firebase
11+
import com.google.firebase.Firebase
12+
import com.google.firebase.auth.auth
1313
import dagger.assisted.Assisted
1414
import dagger.assisted.AssistedInject
1515
import kotlinx.coroutines.Dispatchers

flavor-google/src/main/java/xyz/aprildown/timer/flavor/google/backup/usecases/CloudBackup.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import androidx.work.ExistingWorkPolicy
88
import androidx.work.NetworkType
99
import androidx.work.OneTimeWorkRequestBuilder
1010
import androidx.work.WorkManager
11-
import com.google.firebase.auth.ktx.auth
12-
import com.google.firebase.ktx.Firebase
11+
import com.google.firebase.Firebase
12+
import com.google.firebase.auth.auth
1313
import com.google.firebase.storage.StorageMetadata
14-
import com.google.firebase.storage.ktx.storage
14+
import com.google.firebase.storage.storage
1515
import dagger.Reusable
1616
import dagger.hilt.android.qualifiers.ApplicationContext
1717
import kotlinx.coroutines.CoroutineDispatcher

flavor-google/src/main/java/xyz/aprildown/timer/flavor/google/count/LoadBakedCountResources.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package xyz.aprildown.timer.flavor.google.count
22

33
import android.content.Context
4-
import com.google.firebase.ktx.Firebase
4+
import com.google.firebase.Firebase
55
import com.google.firebase.storage.StorageException
6-
import com.google.firebase.storage.ktx.storage
6+
import com.google.firebase.storage.storage
77
import dagger.Reusable
88
import dagger.hilt.android.qualifiers.ApplicationContext
99
import kotlinx.coroutines.CoroutineDispatcher

flavor-google/src/main/java/xyz/aprildown/timer/flavor/google/utils/FirebaseStorageSetUp.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package xyz.aprildown.timer.flavor.google.utils
22

3-
import com.google.firebase.ktx.Firebase
4-
import com.google.firebase.storage.ktx.storage
3+
import com.google.firebase.Firebase
4+
import com.google.firebase.storage.storage
55

66
internal fun setUpFirebaseStorage() {
77
Firebase.storage.run {

0 commit comments

Comments
 (0)