@@ -4,21 +4,18 @@ package dev.gitlive.firebase.remoteconfig
4
4
import com.google.firebase.remoteconfig.FirebaseRemoteConfigClientException
5
5
import com.google.firebase.remoteconfig.FirebaseRemoteConfigFetchThrottledException
6
6
import com.google.firebase.remoteconfig.FirebaseRemoteConfigServerException
7
- import com.google.firebase.remoteconfig.ktx.remoteConfig
8
- import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
9
7
import dev.gitlive.firebase.Firebase
10
8
import dev.gitlive.firebase.FirebaseApp
11
9
import kotlinx.coroutines.tasks.await
12
- import com.google.firebase.ktx.Firebase as AndroidFirebase
13
10
import com.google.firebase.remoteconfig.FirebaseRemoteConfig as AndroidFirebaseRemoteConfig
14
11
import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo as AndroidFirebaseRemoteConfigInfo
15
12
import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings as AndroidFirebaseRemoteConfigSettings
16
13
17
14
actual val Firebase .remoteConfig: FirebaseRemoteConfig
18
- get() = FirebaseRemoteConfig (AndroidFirebase .remoteConfig )
15
+ get() = FirebaseRemoteConfig (com.google.firebase.remoteconfig. FirebaseRemoteConfig .getInstance() )
19
16
20
17
actual fun Firebase.remoteConfig (app : FirebaseApp ): FirebaseRemoteConfig =
21
- FirebaseRemoteConfig (AndroidFirebase .remoteConfig )
18
+ FirebaseRemoteConfig (com.google.firebase.remoteconfig. FirebaseRemoteConfig .getInstance(app.android) )
22
19
23
20
actual class FirebaseRemoteConfig internal constructor(val android : AndroidFirebaseRemoteConfig ) {
24
21
actual val all: Map <String , FirebaseRemoteConfigValue >
@@ -29,10 +26,10 @@ actual class FirebaseRemoteConfig internal constructor(val android: AndroidFireb
29
26
30
27
actual suspend fun settings (init : FirebaseRemoteConfigSettings .() -> Unit ) {
31
28
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()
36
33
android.setConfigSettingsAsync(androidSettings).await()
37
34
}
38
35
0 commit comments