fix firebase

hoanganhtuan95ptit · Jan 31, 2025 · 3cec112 · 3cec112
1 parent 86557d2
commit 3cec112
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/constant/build.gradle b/constant/build.gradle
@@ -48,7 +48,7 @@ project.ext {
 
     play_core_ktx_version = '1.10.3'
 
-    firebase_bom_version = '30.3.1'
+    firebase_bom_version = '33.8.0'
     firebase_ads_version = '21.1.0'
 
     koinDependencies = [

diff --git a/library/analytics-firebase/src/main/java/com/simple/analytics/firebase/FirebaseAnalytics.kt b/library/analytics-firebase/src/main/java/com/simple/analytics/firebase/FirebaseAnalytics.kt
@@ -1,16 +1,16 @@
 package com.simple.analytics.firebase
 
 import android.annotation.SuppressLint
-import android.content.Context
 import androidx.core.os.bundleOf
-import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.Firebase
+import com.google.firebase.analytics.analytics
 import com.simple.analytics.Analytics
 
-class FirebaseAnalytics(private val context: Context) : Analytics {
+class FirebaseAnalytics : Analytics {
 
     @SuppressLint("MissingPermission")
     override suspend fun execute(eventName: String, vararg params: Pair<String, String>) {
 
-        FirebaseAnalytics.getInstance(context).logEvent(eventName, bundleOf(*params))
+        Firebase.analytics.logEvent(eventName, bundleOf(*params))
     }
 }
diff --git a/...tics-firebase/src/main/java/com/simple/analytics/firebase/FirebaseAnalyticsInitializer.kt b/...tics-firebase/src/main/java/com/simple/analytics/firebase/FirebaseAnalyticsInitializer.kt
@@ -13,7 +13,7 @@ class FirebaseAnalyticsInitializer : Initializer<Unit> {
 
         loadKoinModules(listOf(module {
 
-            single { FirebaseAnalytics(get()) } bind Analytics::class
+            single { FirebaseAnalytics() } bind Analytics::class
 
         }))
 

diff --git a/library/config-firebase/src/main/java/com/simple/config/firebase/FirebaseConfig.kt b/library/config-firebase/src/main/java/com/simple/config/firebase/FirebaseConfig.kt
@@ -1,7 +1,9 @@
 package com.simple.config.firebase
 
+import com.google.firebase.ktx.Firebase
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
+import com.google.firebase.remoteconfig.ktx.remoteConfig
 import com.simple.analytics.logAnalytics
 import com.simple.config.Config
 import com.simple.core.utils.extentions.resumeActive
@@ -13,7 +15,7 @@ class FirebaseConfig : Config {
 
     override suspend fun execute(param: Config.Param): ResultState<String> = suspendCancellableCoroutine { continuation ->
 
-        val config = FirebaseRemoteConfig.getInstance()
+        val config = Firebase.remoteConfig
 
         val configSettings = FirebaseRemoteConfigSettings.Builder()
             .setMinimumFetchIntervalInSeconds(param.timeout)

diff --git a/...crashlytics-firebase/src/main/java/com/simple/crashlytics/firebase/FirebaseCrashlytics.kt b/...crashlytics-firebase/src/main/java/com/simple/crashlytics/firebase/FirebaseCrashlytics.kt
@@ -1,6 +1,7 @@
 package com.simple.crashlytics.firebase
 
-import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.ktx.Firebase
 import com.simple.crashlytics.Crashlytics
 
 class FirebaseCrashlytics : Crashlytics {
@@ -9,6 +10,6 @@ class FirebaseCrashlytics : Crashlytics {
 
         val map = hashMapOf("eventName" to eventName, *params)
 
-        FirebaseCrashlytics.getInstance().recordException(RuntimeException(map.toString(), throwable))
+        Firebase.crashlytics.recordException(RuntimeException(map.toString(), throwable))
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ class FirebaseAnalyticsInitializer : Initializer<Unit> { @@
             loadKoinModules(listOf(module {
-                single { FirebaseAnalytics(get()) } bind Analytics::class
+                single { FirebaseAnalytics() } bind Analytics::class
             }))
@@ Expand Down @@