@@ -4,21 +4,18 @@ package dev.gitlive.firebase.remoteconfig
44import com.google.firebase.remoteconfig.FirebaseRemoteConfigClientException
55import com.google.firebase.remoteconfig.FirebaseRemoteConfigFetchThrottledException
66import com.google.firebase.remoteconfig.FirebaseRemoteConfigServerException
7- import com.google.firebase.remoteconfig.ktx.remoteConfig
8- import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
97import dev.gitlive.firebase.Firebase
108import dev.gitlive.firebase.FirebaseApp
119import kotlinx.coroutines.tasks.await
12- import com.google.firebase.ktx.Firebase as AndroidFirebase
1310import com.google.firebase.remoteconfig.FirebaseRemoteConfig as AndroidFirebaseRemoteConfig
1411import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo as AndroidFirebaseRemoteConfigInfo
1512import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings as AndroidFirebaseRemoteConfigSettings
1613
1714actual val Firebase .remoteConfig: FirebaseRemoteConfig
18- get() = FirebaseRemoteConfig (AndroidFirebase .remoteConfig )
15+ get() = FirebaseRemoteConfig (com.google.firebase.remoteconfig. FirebaseRemoteConfig .getInstance() )
1916
2017actual fun Firebase.remoteConfig (app : FirebaseApp ): FirebaseRemoteConfig =
21- FirebaseRemoteConfig (AndroidFirebase .remoteConfig )
18+ FirebaseRemoteConfig (com.google.firebase.remoteconfig. FirebaseRemoteConfig .getInstance(app.android) )
2219
2320actual class FirebaseRemoteConfig internal constructor(val android : AndroidFirebaseRemoteConfig ) {
2421 actual val all: Map <String , FirebaseRemoteConfigValue >
@@ -29,10 +26,10 @@ actual class FirebaseRemoteConfig internal constructor(val android: AndroidFireb
2926
3027 actual suspend fun settings (init : FirebaseRemoteConfigSettings .() -> Unit ) {
3128 val settings = FirebaseRemoteConfigSettings ().apply (init )
32- val androidSettings = remoteConfigSettings {
33- minimumFetchIntervalInSeconds = settings.minimumFetchIntervalInSeconds
34- fetchTimeoutInSeconds = settings.fetchTimeoutInSeconds
35- }
29+ val androidSettings = com.google.firebase.remoteconfig. FirebaseRemoteConfigSettings . Builder ()
30+ .setMinimumFetchIntervalInSeconds( settings.minimumFetchIntervalInSeconds)
31+ .setFetchTimeoutInSeconds( settings.fetchTimeoutInSeconds)
32+ .build()
3633 android.setConfigSettingsAsync(androidSettings).await()
3734 }
3835
0 commit comments