updated Firebase SDKs (#252)

suntrix · web-flow · commit 4a1ba945fbe8 · 2021-12-13T10:02:16.000Z
* updated Firebase SDKs, fixed one missing -ktx dependency, fixed wrong version of firebase npm dependency in gradle

* updated minSdkVersion

* adjusting try-catch blocks in jsTest

* removed -ktx dependencies
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,13 +17,13 @@ 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")
     }
 }
 
 val targetSdkVersion by extra(30)
-val minSdkVersion by extra(16)
+val minSdkVersion by extra(19)
 
 tasks {
     val updateVersions by registering {
@@ -196,7 +196,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/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -134,7 +134,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-common-ktx")
+                api("com.google.firebase:firebase-common")
             }
         }
 
diff --git a/firebase-app/src/jsTest/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/jsTest/kotlin/dev/gitlive/firebase/firebase.kt
@@ -14,7 +14,7 @@ actual fun runTest(test: suspend () -> Unit) = GlobalScope
         try {
             test()
         } catch (e: dynamic) {
-            e.log()
+            (e as? Throwable)?.log()
             throw e
         }
     }.asDynamic()
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/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -165,7 +165,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-auth-ktx")
+                api("com.google.firebase:firebase-auth")
             }
         }
 
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
@@ -92,7 +92,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-common-ktx")
+                api("com.google.firebase:firebase-common")
             }
         }
 
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/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -143,7 +143,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-database-ktx")
+                api("com.google.firebase:firebase-database")
             }
         }
 
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/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -149,7 +149,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-firestore-ktx")
+                api("com.google.firebase:firebase-firestore")
             }
         }
 
diff --git a/firebase-firestore/src/jsTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/jsTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -16,8 +16,8 @@ actual fun runTest(test: suspend CoroutineScope.() -> Unit) = GlobalScope
     .promise {
         try {
             test()
-        } catch (e: Throwable) {
-            e.log()
+        } catch (e: dynamic) {
+            (e as? Throwable)?.log()
             throw e
         }
     }.asDynamic()
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/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -137,7 +137,7 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-functions-ktx")
+                api("com.google.firebase:firebase-functions")
             }
         }
 
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

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,13 @@ buildscript {`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`dependencies {`
`20`		`- classpath("com.android.tools.build:gradle:7.0.1")`
	`20`	`+ classpath("com.android.tools.build:gradle:7.0.3")`
`21`	`21`	`classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`val targetSdkVersion by extra(30)`
`26`		`-val minSdkVersion by extra(16)`
	`26`	`+val minSdkVersion by extra(19)`
`27`	`27`
`28`	`28`	`tasks {`
`29`	`29`	`val updateVersions by registering {`
`@@ -196,7 +196,7 @@ subprojects {`
`196`	`196`	`dependencies {`
`197`	`197`	`"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")`
`198`	`198`	`"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2")`
`199`		`- "androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.4.1"))`
	`199`	`+ "androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.0"))`
`200`	`200`	`"commonTestImplementation"(kotlin("test-common"))`
`201`	`201`	`"commonTestImplementation"(kotlin("test-annotations-common"))`
`202`	`202`	`"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ kotlin {`
`134`	`134`
`135`	`135`	`val androidMain by getting {`
`136`	`136`	`dependencies {`
`137`		`- api("com.google.firebase:firebase-common-ktx")`
	`137`	`+ api("com.google.firebase:firebase-common")`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ actual fun runTest(test: suspend () -> Unit) = GlobalScope`
`14`	`14`	`try {`
`15`	`15`	`test()`
`16`	`16`	`} catch (e: dynamic) {`
`17`		`- e.log()`
	`17`	`+ (e as? Throwable)?.log()`
`18`	`18`	`throw e`
`19`	`19`	`}`
`20`	`20`	`}.asDynamic()`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.8.0`
	`1`	`+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.9.1`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ kotlin {`
`165`	`165`
`166`	`166`	`val androidMain by getting {`
`167`	`167`	`dependencies {`
`168`		`- api("com.google.firebase:firebase-auth-ktx")`
	`168`	`+ api("com.google.firebase:firebase-auth")`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ kotlin {`
`92`	`92`
`93`	`93`	`val androidMain by getting {`
`94`	`94`	`dependencies {`
`95`		`- api("com.google.firebase:firebase-common-ktx")`
	`95`	`+ api("com.google.firebase:firebase-common")`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ kotlin {`
`143`	`143`
`144`	`144`	`val androidMain by getting {`
`145`	`145`	`dependencies {`
`146`		`- api("com.google.firebase:firebase-database-ktx")`
	`146`	`+ api("com.google.firebase:firebase-database")`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ kotlin {`
`149`	`149`
`150`	`150`	`val androidMain by getting {`
`151`	`151`	`dependencies {`
`152`		`- api("com.google.firebase:firebase-firestore-ktx")`
	`152`	`+ api("com.google.firebase:firebase-firestore")`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ kotlin {`
`137`	`137`
`138`	`138`	`val androidMain by getting {`
`139`	`139`	`dependencies {`
`140`		`- api("com.google.firebase:firebase-functions-ktx")`
	`140`	`+ api("com.google.firebase:firebase-functions")`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`