From d428c35d0abe809f7ddf79776b381c4135c3a79f Mon Sep 17 00:00:00 2001 From: Melad Raouf Date: Wed, 30 Jul 2025 06:32:33 +0300 Subject: [PATCH] Update Firebase dependencies and fix import statements --- gradle/libs.versions.toml | 7 +++---- .../simprints/infra/authstore/db/FirebaseAuthManager.kt | 6 +++--- .../infra/authstore/db/FirebaseAuthManagerTest.kt | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 893c3f6630..cb103350ee 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,14 +36,13 @@ gsm_plugin_version = "4.4.3" play_publisher_version = "3.12.1" play_barcode_version = "18.3.1" -firebase_auth_version = "23.2.1" +firebase_auth_version = "24.0.0" firebase_storage_version = "22.0.0" -firebase_crashlytics_version = "19.4.4" +firebase_crashlytics_version = "20.0.0" firebase_analytics_version = "23.0.0" -firebase_perf_version = "21.0.5" +firebase_perf_version = "22.0.0" firebase_crashlyticsPlugin_version = "3.0.5" firebase_perfPlugin_version = "2.0.0" -firebase_distrtibutionPlugin_version = "5.0.0" # [MS-483] Newer versions of Retrofit (>=2.10.0) don't support android apis <=25 beacuse of the internal Jackson library retrofit_version = "2.9.0" diff --git a/infra/auth-store/src/main/java/com/simprints/infra/authstore/db/FirebaseAuthManager.kt b/infra/auth-store/src/main/java/com/simprints/infra/authstore/db/FirebaseAuthManager.kt index 3775310ad7..317c2d6b92 100644 --- a/infra/auth-store/src/main/java/com/simprints/infra/authstore/db/FirebaseAuthManager.kt +++ b/infra/auth-store/src/main/java/com/simprints/infra/authstore/db/FirebaseAuthManager.kt @@ -2,12 +2,12 @@ package com.simprints.infra.authstore.db import android.content.Context import com.google.android.gms.common.api.ApiException +import com.google.firebase.Firebase import com.google.firebase.FirebaseApp import com.google.firebase.FirebaseNetworkException import com.google.firebase.FirebaseOptions import com.google.firebase.auth.FirebaseAuth -import com.google.firebase.ktx.Firebase -import com.google.firebase.ktx.initialize +import com.google.firebase.initialize import com.simprints.core.DispatcherIO import com.simprints.infra.authstore.domain.JwtTokenHelper.Companion.extractTokenPayloadAsJson import com.simprints.infra.authstore.domain.LoginInfoStore @@ -113,7 +113,7 @@ internal class FirebaseAuthManager @Inject constructor( getFirebaseOptions(token), CORE_BACKEND_PROJECT, ) - } catch (ex: IllegalStateException) { + } catch (_: IllegalStateException) { // IllegalStateException = FirebaseApp name coreBackendFirebaseProject already exists! // We re-initialize because they might be signing into a different project. tryToDeleteCoreApp() diff --git a/infra/auth-store/src/test/java/com/simprints/infra/authstore/db/FirebaseAuthManagerTest.kt b/infra/auth-store/src/test/java/com/simprints/infra/authstore/db/FirebaseAuthManagerTest.kt index 4c053a7d24..90f747938e 100644 --- a/infra/auth-store/src/test/java/com/simprints/infra/authstore/db/FirebaseAuthManagerTest.kt +++ b/infra/auth-store/src/test/java/com/simprints/infra/authstore/db/FirebaseAuthManagerTest.kt @@ -6,14 +6,14 @@ import com.google.android.gms.common.api.ApiException import com.google.android.gms.common.api.Status import com.google.android.gms.tasks.Tasks import com.google.common.truth.Truth.assertThat +import com.google.firebase.Firebase import com.google.firebase.FirebaseApp import com.google.firebase.FirebaseNetworkException import com.google.firebase.FirebaseOptions import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseUser import com.google.firebase.auth.GetTokenResult -import com.google.firebase.ktx.Firebase -import com.google.firebase.ktx.initialize +import com.google.firebase.initialize import com.simprints.infra.authstore.domain.LoginInfoStore import com.simprints.infra.authstore.exceptions.RemoteDbNotSignedInException import com.simprints.infra.network.exceptions.NetworkConnectionException