Skip to content

Commit f9593aa

Browse files
nbransbynbransby
authored
Merge branch 'master' into sdk-updates
2 parents fc3895a + 0ff3444 commit f9593aa

File tree

22 files changed

+26
-56
lines changed

22 files changed

+26
-56
lines changed

‎build.gradle.kts

+1-2
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ subprojects {
162162
args(
163163
it,
164164
"--project-directory", projectDir.resolve("src/nativeInterop/cinterop"),
165-
"--platform", "iOS",
166-
"--cache-builds"
165+
"--platform", "iOS"
167166
)
168167
}
169168
}

‎firebase-app/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ kotlin {
9090
compilations.getByName("main") {
9191
cinterops.create("FirebaseCore") {
9292
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
93-
extraOpts("-verbose")
93+
extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
9494
}
9595
}
9696
}

‎firebase-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-common": "1.4.3",
27-
"firebase": "8.10.0",
27+
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
2929
"kotlinx-coroutines-core": "1.5.2"
3030
}

‎firebase-auth/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ kotlin {
119119
compilations.getByName("main") {
120120
cinterops.create("FirebaseAuth") {
121121
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
122-
extraOpts("-verbose")
122+
extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
123123
}
124124
}
125125
}

‎firebase-auth/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-app": "1.4.3",
27-
"firebase": "8.10.0",
27+
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
2929
"kotlinx-coroutines-core": "1.5.2"
3030
}

‎firebase-common/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ kotlin {
108108

109109
val jsMain by getting {
110110
dependencies {
111-
api(npm("firebase", "8.10.0"))
111+
api(npm("firebase", "9.4.1"))
112112
}
113113
}
114114
}

‎firebase-common/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
2525
"dependencies": {
26-
"firebase": "8.10.0",
26+
"firebase": "9.4.1",
2727
"kotlin": "1.5.31",
2828
"kotlinx-coroutines-core": "1.5.2",
2929
"kotlinx-serialization-kotlinx-serialization-runtime": "1.3.0"

‎firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2020 GitLive Ltd. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5-
@file:JsModule("firebase/app")
5+
@file:JsModule("firebase/compat/app")
66

77
package dev.gitlive.firebase
88

‎firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals2.kt

+10-5
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,24 @@ package dev.gitlive.firebase
66

77
import kotlin.js.Promise
88

9-
@JsModule("firebase/functions")
9+
@JsModule("firebase/compat/functions")
10+
@JsName("default")
1011
external object functions
1112

12-
@JsModule("firebase/auth")
13+
@JsModule("firebase/compat/auth")
14+
@JsName("default")
1315
external object auth
1416

15-
@JsModule("firebase/database")
17+
@JsModule("firebase/compat/database")
18+
@JsName("default")
1619
external object database
1720

18-
@JsModule("firebase/firestore")
21+
@JsModule("firebase/compat/firestore")
22+
@JsName("default")
1923
external object firestore
2024

21-
@JsModule("firebase/remote-config")
25+
@JsModule("firebase/compat/remote-config")
26+
@JsName("default")
2227
external object remoteConfig
2328

2429
typealias SnapshotCallback = (data: firebase.database.DataSnapshot, b: String?) -> Unit

‎firebase-config/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ kotlin {
104104
compilations.getByName("main") {
105105
cinterops.create("FirebaseRemoteConfig") {
106106
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
107-
extraOpts("-verbose")
107+
extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
108108
}
109109
}
110110
}

‎firebase-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-app": "1.4.3",
27-
"firebase": "8.10.0",
27+
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
2929
"kotlinx-coroutines-core": "1.5.2"
3030
}

‎firebase-database/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ kotlin {
9595
compilations.getByName("main") {
9696
cinterops.create("FirebaseDatabase") {
9797
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
98-
extraOpts("-verbose")
98+
extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
9999
}
100100
}
101101
}

‎firebase-database/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-app": "1.4.3",
27-
"firebase": "8.10.0",
27+
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
2929
"kotlinx-coroutines-core": "1.5.2"
3030
}

‎firebase-firestore/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ kotlin {
102102
compilations.getByName("main") {
103103
cinterops.create("FirebaseFirestore") {
104104
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
105-
extraOpts("-verbose")
105+
extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
106106
}
107107
}
108108
}

‎firebase-firestore/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-app": "1.4.3",
27-
"firebase": "8.10.0",
27+
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
2929
"kotlinx-coroutines-core": "1.5.2"
3030
}

‎firebase-firestore/src/androidMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

-3
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,6 @@ actual class DocumentSnapshot(val android: com.google.firebase.firestore.Documen
415415
actual fun <T> data(strategy: DeserializationStrategy<T>, serverTimestampBehavior: ServerTimestampBehavior): T =
416416
decode(strategy, android.getData(serverTimestampBehavior.toAndroid()))
417417

418-
actual fun dataMap(serverTimestampBehavior: ServerTimestampBehavior): Map<String, Any?> =
419-
android.getData(serverTimestampBehavior.toAndroid()) ?: emptyMap()
420-
421418
actual inline fun <reified T> get(field: String, serverTimestampBehavior: ServerTimestampBehavior): T =
422419
decode(value = android.get(field, serverTimestampBehavior.toAndroid()))
423420

‎firebase-firestore/src/commonMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

-2
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,6 @@ expect class DocumentSnapshot {
196196
inline fun <reified T: Any> data(serverTimestampBehavior: ServerTimestampBehavior = ServerTimestampBehavior.NONE): T
197197
fun <T> data(strategy: DeserializationStrategy<T>, serverTimestampBehavior: ServerTimestampBehavior = ServerTimestampBehavior.NONE): T
198198

199-
fun dataMap(serverTimestampBehavior: ServerTimestampBehavior = ServerTimestampBehavior.NONE): Map<String, Any?>
200-
201199
val exists: Boolean
202200
val id: String
203201
val reference: DocumentReference

‎firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt

-20
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ class FirebaseFirestoreTest {
160160
val pendingWritesSnapshot = deferredPendingWritesSnapshot.await()
161161
assertTrue(pendingWritesSnapshot.metadata.hasPendingWrites)
162162
assertNull(pendingWritesSnapshot.get<Double?>("time", ServerTimestampBehavior.NONE))
163-
assertNull(pendingWritesSnapshot.dataMap(ServerTimestampBehavior.NONE)["time"])
164163
}
165164

166165
@Test
@@ -181,7 +180,6 @@ class FirebaseFirestoreTest {
181180
val pendingWritesSnapshot = deferredPendingWritesSnapshot.await()
182181
assertTrue(pendingWritesSnapshot.metadata.hasPendingWrites)
183182
assertNotNull(pendingWritesSnapshot.get<Double?>("time", ServerTimestampBehavior.ESTIMATE))
184-
assertNotNull(pendingWritesSnapshot.dataMap(ServerTimestampBehavior.ESTIMATE)["time"])
185183
assertNotEquals(0.0, pendingWritesSnapshot.data(FirestoreTest.serializer(), ServerTimestampBehavior.ESTIMATE).time)
186184
}
187185

@@ -203,7 +201,6 @@ class FirebaseFirestoreTest {
203201
val pendingWritesSnapshot = deferredPendingWritesSnapshot.await()
204202
assertTrue(pendingWritesSnapshot.metadata.hasPendingWrites)
205203
assertNull(pendingWritesSnapshot.get<Double?>("time", ServerTimestampBehavior.PREVIOUS))
206-
assertNull(pendingWritesSnapshot.dataMap(ServerTimestampBehavior.PREVIOUS)["time"])
207204
}
208205

209206
@Test
@@ -223,23 +220,6 @@ class FirebaseFirestoreTest {
223220
assertEquals("AutoId", resultDoc.get("prop1"))
224221
}
225222

226-
@Test
227-
fun testDataMap() = runTest {
228-
val doc = Firebase.firestore
229-
.collection("testDataMap")
230-
.document
231-
232-
doc.set(FirestoreTest.serializer(), FirestoreTest("dataMap", 123.45))
233-
234-
val resultDoc = Firebase.firestore
235-
.collection("testDataMap")
236-
.document(doc.id)
237-
.get()
238-
239-
assertEquals(true, resultDoc.exists)
240-
assertEquals(mapOf("prop1" to "dataMap", "time" to 123.45), resultDoc.dataMap())
241-
}
242-
243223
private suspend fun setupFirestoreData() {
244224
Firebase.firestore.collection("FirebaseFirestoreTest")
245225
.document("one")

‎firebase-firestore/src/iosMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

-6
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,6 @@ actual class DocumentSnapshot(val ios: FIRDocumentSnapshot) {
388388
return decode(strategy, data?.mapValues { (_, value) -> value?.takeIf { it !is NSNull } })
389389
}
390390

391-
actual fun dataMap(serverTimestampBehavior: ServerTimestampBehavior): Map<String, Any?> =
392-
ios.dataWithServerTimestampBehavior(serverTimestampBehavior.toIos())
393-
?.map { (key, value) -> key.toString() to value?.takeIf { it !is NSNull } }
394-
?.toMap()
395-
?: emptyMap()
396-
397391
actual inline fun <reified T> get(field: String, serverTimestampBehavior: ServerTimestampBehavior): T {
398392
val value = ios.valueForField(field, serverTimestampBehavior.toIos())?.takeIf { it !is NSNull }
399393
return decode(value)

‎firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt

-3
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,6 @@ actual class DocumentSnapshot(val js: firebase.firestore.DocumentSnapshot) {
393393
actual fun <T> data(strategy: DeserializationStrategy<T>, serverTimestampBehavior: ServerTimestampBehavior): T =
394394
rethrow { decode(strategy, js.data(getTimestampsOptions(serverTimestampBehavior))) }
395395

396-
actual fun dataMap(serverTimestampBehavior: ServerTimestampBehavior): Map<String, Any?> =
397-
rethrow { mapOf(js.data(getTimestampsOptions(serverTimestampBehavior)).asDynamic()) }
398-
399396
actual inline fun <reified T> get(field: String, serverTimestampBehavior: ServerTimestampBehavior) =
400397
rethrow { decode<T>(value = js.get(field, getTimestampsOptions(serverTimestampBehavior))) }
401398

‎firebase-functions/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ kotlin {
9090
compilations.getByName("main") {
9191
cinterops.create("FirebaseFunctions") {
9292
compilerOpts(nativeFrameworkPaths.map { "-F$it" })
93-
extraOpts("-verbose")
93+
extraOpts = listOf("-compiler-option", "-DNS_FORMAT_ARGUMENT(A)=", "-verbose")
9494
}
9595
}
9696
}

‎firebase-functions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-app": "1.4.3",
27-
"firebase": "8.10.0",
27+
"firebase": "9.4.1",
2828
"kotlin": "1.5.31",
2929
"kotlinx-coroutines-core": "1.5.2"
3030
}

0 commit comments

Comments
 (0)