updated Firebase SDKs, fixed one missing -ktx dependency

GitLiveApp · Nov 15, 2021 · a92106b · a92106b
1 parent 9ce9222
commit a92106b
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 28 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.1")
+        classpath("com.android.tools.build:gradle:7.0.3")
         classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")
     }
 }
@@ -197,7 +197,7 @@ subprojects {
         dependencies {
             "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
             "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2")
-            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.4.1"))
+            "androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.0"))
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
             "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")

diff --git a/firebase-app/package.json b/firebase-app/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-common": "1.4.3",
-    "firebase": "8.10.0",
+    "firebase": "9.4.1",
     "kotlin": "1.5.31",
     "kotlinx-coroutines-core": "1.5.2"
   }

diff --git a/firebase-app/src/nativeInterop/cinterop/Cartfile b/firebase-app/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.9.1
diff --git a/firebase-auth/package.json b/firebase-auth/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.4.3",
-    "firebase": "8.10.0",
+    "firebase": "9.4.1",
     "kotlin": "1.5.31",
     "kotlinx-coroutines-core": "1.5.2"
   }

diff --git a/firebase-auth/src/jsTest/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/jsTest/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -15,8 +15,8 @@ actual fun runTest(test: suspend () -> Unit) = GlobalScope
     .promise {
         try {
             test()
-        } catch (e: dynamic) {
-            (e as? Throwable)?.log()
+        } catch (e: Throwable) {
+            e.log()
             throw e
         }
     }.asDynamic()

diff --git a/firebase-auth/src/nativeInterop/cinterop/Cartfile b/firebase-auth/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.9.1
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -108,7 +108,7 @@ kotlin {
 
         val jsMain by getting {
             dependencies {
-                api(npm("firebase", "8.7.1"))
+                api(npm("firebase", "9.4.1"))
             }
         }
     }

diff --git a/firebase-common/package.json b/firebase-common/package.json
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "firebase": "8.10.0",
+    "firebase": "9.4.1",
     "kotlin": "1.5.31",
     "kotlinx-coroutines-core": "1.5.2",
     "kotlinx-serialization-kotlinx-serialization-runtime": "1.3.0"

diff --git a/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt b/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt
@@ -2,8 +2,7 @@
  * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
  */
 
-@file:JsModule("firebase/app")
-
+@file:JsModule("firebase/compat/app")
 package dev.gitlive.firebase
 
 import kotlin.js.Json

diff --git a/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals2.kt b/firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals2.kt
@@ -6,19 +6,19 @@ package dev.gitlive.firebase
 
 import kotlin.js.Promise
 
-@JsModule("firebase/functions")
+@JsModule("firebase/compat/functions")
 external object functions
 
-@JsModule("firebase/auth")
+@JsModule("firebase/compat/auth")
 external object auth
 
-@JsModule("firebase/database")
+@JsModule("firebase/compat/database")
 external object database
 
-@JsModule("firebase/firestore")
+@JsModule("firebase/compat/firestore")
 external object firestore
 
-@JsModule("firebase/remote-config")
+@JsModule("firebase/compat/remote-config")
 external object remoteConfig
 
 typealias SnapshotCallback = (data: firebase.database.DataSnapshot, b: String?) -> Unit

diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts
@@ -143,7 +143,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-config")
+                api("com.google.firebase:firebase-config-ktx")
             }
         }
 

diff --git a/firebase-config/package.json b/firebase-config/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.4.3",
-    "firebase": "8.10.0",
+    "firebase": "9.4.1",
     "kotlin": "1.5.31",
     "kotlinx-coroutines-core": "1.5.2"
   }

diff --git a/...se-config/src/androidAndroidTest/kotlin/dev/gitlive/firebase/remoteconfig/RemoteConfig.kt b/...se-config/src/androidAndroidTest/kotlin/dev/gitlive/firebase/remoteconfig/RemoteConfig.kt
@@ -8,6 +8,8 @@ package dev.gitlive.firebase.remoteconfig
 import androidx.test.platform.app.InstrumentationRegistry
 import kotlinx.coroutines.runBlocking
 
+actual val emulatorHost: String = "10.0.2.2"
+
 actual val context: Any = InstrumentationRegistry.getInstrumentation().targetContext
 
 actual fun runTest(test: suspend () -> Unit) = runBlocking { test() }
diff --git a/firebase-config/src/jsTest/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt b/firebase-config/src/jsTest/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt
@@ -9,8 +9,8 @@ actual fun runTest(test: suspend () -> Unit) = GlobalScope
     .promise {
         try {
             test()
-        } catch (e: dynamic) {
-            (e as? Throwable)?.log()
+        } catch (e: Throwable) {
+            e.log()
             throw e
         }
     }.asDynamic()

diff --git a/firebase-config/src/nativeInterop/cinterop/Cartfile b/firebase-config/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" == 8.9.1
diff --git a/firebase-database/package.json b/firebase-database/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.4.3",
-    "firebase": "8.10.0",
+    "firebase": "9.4.1",
     "kotlin": "1.5.31",
     "kotlinx-coroutines-core": "1.5.2"
   }

diff --git a/firebase-database/src/nativeInterop/cinterop/Cartfile b/firebase-database/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json" == 8.9.1
diff --git a/firebase-firestore/package.json b/firebase-firestore/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.4.3",
-    "firebase": "8.10.0",
+    "firebase": "9.4.1",
     "kotlin": "1.5.31",
     "kotlinx-coroutines-core": "1.5.2"
   }

diff --git a/firebase-firestore/src/nativeInterop/cinterop/Cartfile b/firebase-firestore/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json" == 8.9.1
diff --git a/firebase-functions/package.json b/firebase-functions/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.4.3",
-    "firebase": "8.10.0",
+    "firebase": "9.4.1",
     "kotlin": "1.5.31",
     "kotlinx-coroutines-core": "1.5.2"
   }

diff --git a/firebase-functions/src/nativeInterop/cinterop/Cartfile b/firebase-functions/src/nativeInterop/cinterop/Cartfile
@@ -1 +1 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 8.8.0
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json" == 8.9.1