Skip to content

Commit fa7a118

Browse files
authored
Removed direct reference of ktx to be in-line with the other android … (#224)
* Removed direct reference of ktx to be in-line with the other android targets and firebase projects. * use library without ktx reference
1 parent e126af8 commit fa7a118

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

firebase-config/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ kotlin {
138138

139139
val androidMain by getting {
140140
dependencies {
141-
api("com.google.firebase:firebase-config-ktx")
141+
api("com.google.firebase:firebase-config")
142142
}
143143
}
144144

firebase-config/src/androidMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

+6-9
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,18 @@ package dev.gitlive.firebase.remoteconfig
44
import com.google.firebase.remoteconfig.FirebaseRemoteConfigClientException
55
import com.google.firebase.remoteconfig.FirebaseRemoteConfigFetchThrottledException
66
import com.google.firebase.remoteconfig.FirebaseRemoteConfigServerException
7-
import com.google.firebase.remoteconfig.ktx.remoteConfig
8-
import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
97
import dev.gitlive.firebase.Firebase
108
import dev.gitlive.firebase.FirebaseApp
119
import kotlinx.coroutines.tasks.await
12-
import com.google.firebase.ktx.Firebase as AndroidFirebase
1310
import com.google.firebase.remoteconfig.FirebaseRemoteConfig as AndroidFirebaseRemoteConfig
1411
import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo as AndroidFirebaseRemoteConfigInfo
1512
import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings as AndroidFirebaseRemoteConfigSettings
1613

1714
actual val Firebase.remoteConfig: FirebaseRemoteConfig
18-
get() = FirebaseRemoteConfig(AndroidFirebase.remoteConfig)
15+
get() = FirebaseRemoteConfig(com.google.firebase.remoteconfig.FirebaseRemoteConfig.getInstance())
1916

2017
actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig =
21-
FirebaseRemoteConfig(AndroidFirebase.remoteConfig)
18+
FirebaseRemoteConfig(com.google.firebase.remoteconfig.FirebaseRemoteConfig.getInstance(app.android))
2219

2320
actual 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

Comments
 (0)