From 829be6767cfa7d99f7265ce97705089347a8c5d7 Mon Sep 17 00:00:00 2001 From: Andrew Reed Date: Wed, 22 Sep 2021 17:39:15 +0100 Subject: [PATCH 1/2] Removed direct reference of ktx to be in-line with the other android targets and firebase projects. --- .../firebase/remoteconfig/FirebaseRemoteConfig.kt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/firebase-config/src/androidMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt b/firebase-config/src/androidMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt index 59b9108b7..2e43b9a10 100644 --- a/firebase-config/src/androidMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt +++ b/firebase-config/src/androidMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt @@ -4,21 +4,18 @@ package dev.gitlive.firebase.remoteconfig import com.google.firebase.remoteconfig.FirebaseRemoteConfigClientException import com.google.firebase.remoteconfig.FirebaseRemoteConfigFetchThrottledException import com.google.firebase.remoteconfig.FirebaseRemoteConfigServerException -import com.google.firebase.remoteconfig.ktx.remoteConfig -import com.google.firebase.remoteconfig.ktx.remoteConfigSettings import dev.gitlive.firebase.Firebase import dev.gitlive.firebase.FirebaseApp import kotlinx.coroutines.tasks.await -import com.google.firebase.ktx.Firebase as AndroidFirebase import com.google.firebase.remoteconfig.FirebaseRemoteConfig as AndroidFirebaseRemoteConfig import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo as AndroidFirebaseRemoteConfigInfo import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings as AndroidFirebaseRemoteConfigSettings actual val Firebase.remoteConfig: FirebaseRemoteConfig - get() = FirebaseRemoteConfig(AndroidFirebase.remoteConfig) + get() = FirebaseRemoteConfig(com.google.firebase.remoteconfig.FirebaseRemoteConfig.getInstance()) actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig = - FirebaseRemoteConfig(AndroidFirebase.remoteConfig) + FirebaseRemoteConfig(com.google.firebase.remoteconfig.FirebaseRemoteConfig.getInstance(app.android)) actual class FirebaseRemoteConfig internal constructor(val android: AndroidFirebaseRemoteConfig) { actual val all: Map @@ -29,10 +26,10 @@ actual class FirebaseRemoteConfig internal constructor(val android: AndroidFireb actual suspend fun settings(init: FirebaseRemoteConfigSettings.() -> Unit) { val settings = FirebaseRemoteConfigSettings().apply(init) - val androidSettings = remoteConfigSettings { - minimumFetchIntervalInSeconds = settings.minimumFetchIntervalInSeconds - fetchTimeoutInSeconds = settings.fetchTimeoutInSeconds - } + val androidSettings = com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder() + .setMinimumFetchIntervalInSeconds(settings.minimumFetchIntervalInSeconds) + .setFetchTimeoutInSeconds(settings.fetchTimeoutInSeconds) + .build() android.setConfigSettingsAsync(androidSettings).await() } From 07aa2e8779555731f74796b4d48a3393c6a203b1 Mon Sep 17 00:00:00 2001 From: Andrew Reed Date: Wed, 22 Sep 2021 18:28:34 +0100 Subject: [PATCH 2/2] use library without ktx reference --- firebase-config/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts index e35024c74..e480822b4 100644 --- a/firebase-config/build.gradle.kts +++ b/firebase-config/build.gradle.kts @@ -138,7 +138,7 @@ kotlin { val androidMain by getting { dependencies { - api("com.google.firebase:firebase-config-ktx") + api("com.google.firebase:firebase-config") } }