Merge branch 'master' into add-parent-field

nbransby · web-flow · commit 61d68c586fb8 · 2022-03-19T13:25:17.000+02:00
diff --git a/README.md b/README.md
@@ -93,7 +93,13 @@ You can also omit the serializer but this is discouraged due to a [current limit
 
 ```kotlin
 @Serializable
-data class Post(val timestamp: Double = ServerValue.TIMESTAMP)
+data class Post(
+    // In case using Realtime Database.
+    val timestamp: Double = ServerValue.TIMESTAMP,
+    // In case using Cloud Firestore.
+    val timestamp: Double = FieldValue.serverTimestamp,
+)
+
 ```
 
 <h3><a href="https://kotlinlang.org/docs/reference/functions.html#default-arguments">Default arguments</a></h3>
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 {
@@ -162,8 +162,7 @@ subprojects {
                     args(
                         it,
                         "--project-directory", projectDir.resolve("src/nativeInterop/cinterop"),
-                        "--platform", "iOS",
-                        "--cache-builds"
+                        "--platform", "iOS"
                     )
                 }
             }
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -90,7 +90,7 @@ kotlin {
             compilations.getByName("main") {
                 cinterops.create("FirebaseCore") {
                     compilerOpts(nativeFrameworkPaths.map { "-F$it" })
-                    extraOpts("-verbose")
+                    extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
                 }
             }
         }
@@ -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/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/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
@@ -119,7 +119,7 @@ kotlin {
             compilations.getByName("main") {
                 cinterops.create("FirebaseAuth") {
                     compilerOpts(nativeFrameworkPaths.map { "-F$it" })
-                    extraOpts("-verbose")
+                    extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
                 }
             }
         }
@@ -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/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/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")
             }
         }
 
@@ -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,7 +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
 
@@ -379,6 +379,7 @@ external object firebase {
             fun limit(limit: Double): Query
             fun orderBy(field: String, direction: Any): Query
             fun orderBy(field: FieldPath, direction: Any): Query
+            fun startAfter(document: DocumentSnapshot): Query
         }
 
         open class CollectionReference : Query {
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,24 @@ package dev.gitlive.firebase
 
 import kotlin.js.Promise
 
-@JsModule("firebase/functions")
+@JsModule("firebase/compat/functions")
+@JsName("default")
 external object functions
 
-@JsModule("firebase/auth")
+@JsModule("firebase/compat/auth")
+@JsName("default")
 external object auth
 
-@JsModule("firebase/database")
+@JsModule("firebase/compat/database")
+@JsName("default")
 external object database
 
-@JsModule("firebase/firestore")
+@JsModule("firebase/compat/firestore")
+@JsName("default")
 external object firestore
 
-@JsModule("firebase/remote-config")
+@JsModule("firebase/compat/remote-config")
+@JsName("default")
 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
@@ -104,7 +104,7 @@ kotlin {
             compilations.getByName("main") {
                 cinterops.create("FirebaseRemoteConfig") {
                     compilerOpts(nativeFrameworkPaths.map { "-F$it" })
-                    extraOpts("-verbose")
+                    extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
                 }
             }
         }
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/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
@@ -95,7 +95,7 @@ kotlin {
             compilations.getByName("main") {
                 cinterops.create("FirebaseDatabase") {
                     compilerOpts(nativeFrameworkPaths.map { "-F$it" })
-                    extraOpts("-verbose")
+                    extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
                 }
             }
         }
@@ -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/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/androidMain/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/androidMain/kotlin/dev/gitlive/firebase/database/database.kt
@@ -67,6 +67,9 @@ actual class FirebaseDatabase internal constructor(val android: com.google.fireb
     actual fun reference(path: String) =
         DatabaseReference(android.getReference(path), persistenceEnabled)
 
+    actual fun reference() =
+        DatabaseReference(android.reference, persistenceEnabled)
+
     actual fun setPersistenceEnabled(enabled: Boolean) =
         android.setPersistenceEnabled(enabled).also { persistenceEnabled = enabled }
 
diff --git a/firebase-database/src/commonMain/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/commonMain/kotlin/dev/gitlive/firebase/database/database.kt
@@ -25,6 +25,7 @@ expect fun Firebase.database(app: FirebaseApp, url: String): FirebaseDatabase
 
 expect class FirebaseDatabase {
     fun reference(path: String): DatabaseReference
+    fun reference(): DatabaseReference
     fun setPersistenceEnabled(enabled: Boolean)
     fun setLoggingEnabled(enabled: Boolean)
     fun useEmulator(host: String, port: Int)
diff --git a/firebase-database/src/iosMain/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/iosMain/kotlin/dev/gitlive/firebase/database/database.kt
@@ -51,6 +51,9 @@ actual class FirebaseDatabase internal constructor(val ios: FIRDatabase) {
     actual fun reference(path: String) =
         DatabaseReference(ios.referenceWithPath(path), ios.persistenceEnabled)
 
+    actual fun reference() =
+        DatabaseReference(ios.reference(), ios.persistenceEnabled)
+
     actual fun setPersistenceEnabled(enabled: Boolean) {
         ios.persistenceEnabled = enabled
     }
diff --git a/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt
@@ -37,6 +37,7 @@ actual fun Firebase.database(app: FirebaseApp, url: String) =
 
 actual class FirebaseDatabase internal constructor(val js: firebase.database.Database) {
     actual fun reference(path: String) = rethrow { DatabaseReference(js.ref(path)) }
+    actual fun reference() = rethrow { DatabaseReference(js.ref()) }
     actual fun setPersistenceEnabled(enabled: Boolean) {}
     actual fun setLoggingEnabled(enabled: Boolean) = rethrow { firebase.database.enableLogging(enabled) }
     actual fun useEmulator(host: String, port: Int) = rethrow { js.useEmulator(host, port) }
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
@@ -102,7 +102,7 @@ kotlin {
             compilations.getByName("main") {
                 cinterops.create("FirebaseFirestore") {
                     compilerOpts(nativeFrameworkPaths.map { "-F$it" })
-                    extraOpts("-verbose")
+                    extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
                 }
             }
         }
@@ -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/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/androidMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/androidMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -357,6 +357,8 @@ actual open class Query(open val android: com.google.firebase.firestore.Query) {
 
     internal actual fun _orderBy(field: String, direction: Direction) = Query(android.orderBy(field, direction))
     internal actual fun _orderBy(field: FieldPath, direction: Direction) = Query(android.orderBy(field.android, direction))
+
+    internal actual fun _startAfter(document: DocumentSnapshot) = Query(android.startAfter(document.android))
 }
 
 actual typealias Direction = com.google.firebase.firestore.Query.Direction
diff --git a/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -67,6 +67,8 @@ expect open class Query {
 
     internal fun _orderBy(field: String, direction: Direction): Query
     internal fun _orderBy(field: FieldPath, direction: Direction): Query
+
+    internal fun _startAfter(document: DocumentSnapshot): Query
 }
 
 fun Query.where(field: String, equalTo: Any?) = _where(field, equalTo)
@@ -81,6 +83,8 @@ fun Query.where(path: FieldPath, inArray: List<Any>? = null, arrayContainsAny: L
 fun Query.orderBy(field: String, direction: Direction = Direction.ASCENDING) = _orderBy(field, direction)
 fun Query.orderBy(field: FieldPath, direction: Direction = Direction.ASCENDING) = _orderBy(field, direction)
 
+fun Query.startAfter(document: DocumentSnapshot) = _startAfter(document)
+
 expect class WriteBatch {
     inline fun <reified T> set(documentRef: DocumentReference, data: T, encodeDefaults: Boolean = true, merge: Boolean = false): WriteBatch
     inline fun <reified T> set(documentRef: DocumentReference, data: T, encodeDefaults: Boolean = true, vararg mergeFields: String): WriteBatch
diff --git a/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -220,6 +220,25 @@ class FirebaseFirestoreTest {
         assertEquals("AutoId", resultDoc.get("prop1"))
     }
 
+    @Test
+    fun testStartAfterDocumentSnapshot() = runTest {
+        setupFirestoreData()
+        val query = Firebase.firestore
+            .collection("FirebaseFirestoreTest")
+            .orderBy("prop1", Direction.ASCENDING)
+
+        val firstPage = query.limit(2).get().documents // First 2 results
+        assertEquals(2, firstPage.size)
+        assertEquals("aaa", firstPage[0].get("prop1"))
+        assertEquals("bbb", firstPage[1].get("prop1"))
+
+        val lastDocumentSnapshot = firstPage.lastOrNull()
+        assertNotNull(lastDocumentSnapshot)
+        val secondPage = query.startAfter(lastDocumentSnapshot).limit(2).get().documents // Second 2 results (only one left)
+        assertEquals(1, secondPage.size)
+        assertEquals("ccc", secondPage[0].get("prop1"))
+    }
+
     private suspend fun setupFirestoreData() {
         Firebase.firestore.collection("FirebaseFirestoreTest")
             .document("one")
diff --git a/firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -273,9 +273,10 @@ actual open class Query(open val ios: FIRQuery) {
     )
 
     internal actual fun _orderBy(field: String, direction: Direction) = Query(ios.queryOrderedByField(field, direction == Direction.DESCENDING))
-
     internal actual fun _orderBy(field: FieldPath, direction: Direction) = Query(ios.queryOrderedByFieldPath(field.ios, direction == Direction.DESCENDING))
 
+    internal actual fun _startAfter(document: DocumentSnapshot) = Query(ios.queryStartingAfterDocument(document.ios))
+
 }
 @Suppress("UNCHECKED_CAST")
 actual class CollectionReference(override val ios: FIRCollectionReference) : Query(ios) {
diff --git a/firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -332,6 +332,10 @@ actual open class Query(open val js: firebase.firestore.Query) {
         Query(js.orderBy(field.js, direction.jsString))
     }
 
+    internal actual fun _startAfter(document: DocumentSnapshot) = rethrow {
+        Query(js.startAfter(document.js))
+    }
+
     actual val snapshots get() = callbackFlow<QuerySnapshot> {
         val unsubscribe = rethrow {
             js.onSnapshot(
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
diff --git a/firebase-functions/package.json b/firebase-functions/package.json
diff --git a/firebase-functions/src/nativeInterop/cinterop/Cartfile b/firebase-functions/src/nativeInterop/cinterop/Cartfile

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 {`
`@@ -162,8 +162,7 @@ subprojects {`
`162`	`162`	`args(`
`163`	`163`	`it,`
`164`	`164`	`"--project-directory", projectDir.resolve("src/nativeInterop/cinterop"),`
`165`		`- "--platform", "iOS",`
`166`		`- "--cache-builds"`
	`165`	`+ "--platform", "iOS"`
`167`	`166`	`)`
`168`	`167`	`}`
`169`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ kotlin {`
`90`	`90`	`compilations.getByName("main") {`
`91`	`91`	`cinterops.create("FirebaseCore") {`
`92`	`92`	`compilerOpts(nativeFrameworkPaths.map { "-F$it" })`
`93`		`- extraOpts("-verbose")`
	`93`	`+ extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`}`
`@@ -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
`@@ -24,7 +24,7 @@`
`24`	`24`	`"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",`
`25`	`25`	`"dependencies": {`
`26`	`26`	`"@gitlive/firebase-common": "1.4.3",`
`27`		`- "firebase": "8.10.0",`
	`27`	`+ "firebase": "9.4.1",`
`28`	`28`	`"kotlin": "1.5.31",`
`29`	`29`	`"kotlinx-coroutines-core": "1.5.2"`
`30`	`30`	`}`
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
`@@ -119,7 +119,7 @@ kotlin {`
`119`	`119`	`compilations.getByName("main") {`
`120`	`120`	`cinterops.create("FirebaseAuth") {`
`121`	`121`	`compilerOpts(nativeFrameworkPaths.map { "-F$it" })`
`122`		`- extraOpts("-verbose")`
	`122`	`+ extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`}`
`@@ -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`
`@@ -108,7 +108,7 @@ kotlin {`
`108`	`108`
`109`	`109`	`val jsMain by getting {`
`110`	`110`	`dependencies {`
`111`		`- api(npm("firebase", "8.7.1"))`
	`111`	`+ api(npm("firebase", "9.4.1"))`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`}`