Skip to content

Commit 8679203

Browse files
committed
add ios implementation for firestore
1 parent deabeef commit 8679203

File tree

10 files changed

+274
-362
lines changed

10 files changed

+274
-362
lines changed

firebase-app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ kotlin {
5353
}
5454

5555
val iosArm64 = iosArm64()
56-
val iosX64 = iosX64()
56+
val iosX64 = iosX64("ios")
5757

5858
sourceSets {
5959
val commonMain by getting {
@@ -69,7 +69,7 @@ kotlin {
6969
val jvmMain by getting {
7070
kotlin.srcDir("src/androidMain/kotlin")
7171
}
72-
val iosMain by creating
72+
// val iosMain by creating
7373

7474
configure(listOf(iosArm64, iosX64)) {
7575
compilations.getByName("main") {

firebase-auth/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ kotlin {
3434
publishLibraryVariants("release", "debug")
3535
}
3636
val iosArm64 = iosArm64()
37-
val iosX64 = iosX64()
37+
val iosX64 = iosX64("ios")
3838
jvm {
3939
val main by compilations.getting {
4040
kotlinOptions {
@@ -63,7 +63,7 @@ kotlin {
6363
api("com.google.firebase:firebase-auth:19.1.0")
6464
}
6565
}
66-
val iosMain by creating
66+
// val iosMain by creating
6767
val jvmMain by getting {
6868
kotlin.srcDir("src/androidMain/kotlin")
6969
}

firebase-common/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ kotlin {
3838
}
3939

4040
val iosArm64 = iosArm64()
41-
val iosX64 = iosX64()
41+
val iosX64 = iosX64("ios")
4242

4343
jvm {
4444
val main by compilations.getting {
@@ -80,7 +80,7 @@ kotlin {
8080
}
8181
kotlin.srcDir("src/androidMain/kotlin")
8282
}
83-
val iosMain by creating {
83+
val iosMain by getting {
8484
dependencies {
8585
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.14.0")
8686
}

firebase-database/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ kotlin {
4141
}
4242
}
4343
val iosArm64 = iosArm64()
44-
val iosX64 = iosX64()
44+
val iosX64 = iosX64("ios")
4545

4646
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
4747
kotlinOptions.freeCompilerArgs += listOf(
@@ -76,7 +76,7 @@ kotlin {
7676
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.14.0")
7777
}
7878
}
79-
val iosMain by creating
79+
// val iosMain by creating
8080

8181
configure(listOf(iosArm64, iosX64)) {
8282
compilations.getByName("main") {

firebase-firestore/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ kotlin {
3434
publishLibraryVariants("release", "debug")
3535
}
3636
val iosArm64 = iosArm64()
37-
val iosX64 = iosX64()
37+
val iosX64 = iosX64("ios")
3838
jvm {
3939
val main by compilations.getting {
4040
kotlinOptions {
@@ -65,7 +65,7 @@ kotlin {
6565
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
6666
}
6767
}
68-
val iosMain by creating
68+
// val iosMain by creating
6969
val jvmMain by getting {
7070
dependencies {
7171
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")

firebase-firestore/src/androidMain/kotlin/dev/teamhub/firebase/firestore/firestore.kt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ actual class WriteBatch(val android: com.google.firebase.firestore.WriteBatch) {
9595
documentRef.android,
9696
fieldsAndValues[0].first,
9797
fieldsAndValues[0].second,
98-
*fieldsAndValues.flatMap { (field, value) ->
98+
*fieldsAndValues.drop(1).flatMap { (field, value) ->
9999
listOf(field, value?.let { encode(value) })
100100
}.toTypedArray()
101101
).let { this }
@@ -167,7 +167,7 @@ actual class Transaction(val android: com.google.firebase.firestore.Transaction)
167167
documentRef.android,
168168
fieldsAndValues[0].first,
169169
fieldsAndValues[0].second,
170-
*fieldsAndValues.flatMap { (field, value) ->
170+
*fieldsAndValues.drop(1).flatMap { (field, value) ->
171171
listOf(field, value?.let { encode(value) })
172172
}.toTypedArray()
173173
).let { this }
@@ -238,7 +238,7 @@ actual class DocumentReference(val android: com.google.firebase.firestore.Docume
238238
?.update(
239239
fieldsAndValues[0].first,
240240
fieldsAndValues[0].second,
241-
*fieldsAndValues.flatMap { (field, value) ->
241+
*fieldsAndValues.drop(1).flatMap { (field, value) ->
242242
listOf(field, value?.let { encode(value) })
243243
}.toTypedArray()
244244
)
@@ -340,11 +340,9 @@ actual typealias FieldPath = com.google.firebase.firestore.FieldPath
340340

341341
actual fun FieldPath(vararg fieldNames: String) = FieldPath.of(*fieldNames)
342342

343-
actual typealias FieldValueImpl = com.google.firebase.firestore.FieldValue
344-
345343
actual object FieldValue {
346-
actual fun delete() = FieldValueImpl.delete()
347-
actual fun arrayUnion(vararg elements: Any) = FieldValueImpl.arrayUnion(*elements)
348-
actual fun arrayRemove(vararg elements: Any) = FieldValueImpl.arrayRemove(*elements)
344+
actual fun delete(): Any = com.google.firebase.firestore.FieldValue.delete()
345+
actual fun arrayUnion(vararg elements: Any): Any = com.google.firebase.firestore.FieldValue.arrayUnion(*elements)
346+
actual fun arrayRemove(vararg elements: Any): Any = com.google.firebase.firestore.FieldValue.arrayRemove(*elements)
349347
}
350348

firebase-firestore/src/commonMain/kotlin/dev/teamhub/firebase/firestore/firestore.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,9 @@ expect class FieldPath
174174
expect fun FieldPath(vararg fieldNames: String): FieldPath
175175

176176
expect object FieldValue {
177-
fun delete(): FieldValueImpl
178-
fun arrayUnion(vararg elements: Any): FieldValueImpl
179-
fun arrayRemove(vararg elements: Any): FieldValueImpl
177+
fun delete(): Any
178+
fun arrayUnion(vararg elements: Any): Any
179+
fun arrayRemove(vararg elements: Any): Any
180180
}
181181

182-
expect abstract class FieldValueImpl
183-
184182

0 commit comments

Comments
 (0)