JVM support

Author: Daeda88

firebase-firestore/build.gradle.kts

@@ -171,10 +171,6 @@ kotlin {
                 api("com.google.firebase:firebase-firestore")
             }
         }
-
-        getByName("jvmMain") {
-            kotlin.srcDir("src/androidMain/kotlin")
-        }
     }
 }
 

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

@@ -1,6 +1,5 @@
 package dev.gitlive.firebase.firestore
 
-import dev.gitlive.firebase.firebaseSerializer
 import dev.gitlive.firebase.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals

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

@@ -510,17 +510,15 @@ class FirebaseFirestoreTest {
         collection.add(DocumentWithTimestamp.serializer(), DocumentWithTimestamp(pastTimestamp))
         collection.add(DocumentWithTimestamp.serializer(), DocumentWithTimestamp(futureTimestamp))
 
-        val equalityQueryResult = collection.where(
-            path = FieldPath(DocumentWithTimestamp::time.name),
-            equalTo = pastTimestamp
-        ).get().documents.map { it.data(DocumentWithTimestamp.serializer()) }.toSet()
+        val equalityQueryResult = collection.where {
+            FieldPath(DocumentWithTimestamp::time.name) equalTo pastTimestamp
+        }.get().documents.map { it.data(DocumentWithTimestamp.serializer()) }.toSet()
 
         assertEquals(setOf(DocumentWithTimestamp(pastTimestamp)), equalityQueryResult)
 
-        val gtQueryResult = collection.where(
-            path = FieldPath(DocumentWithTimestamp::time.name),
-            greaterThan = timestamp
-        ).get().documents.map { it.data(DocumentWithTimestamp.serializer()) }.toSet()
+        val gtQueryResult = collection.where {
+            FieldPath(DocumentWithTimestamp::time.name) greaterThan timestamp
+        }.get().documents.map { it.data(DocumentWithTimestamp.serializer()) }.toSet()
 
         assertEquals(setOf(DocumentWithTimestamp(futureTimestamp)), gtQueryResult)
     }

firebase-firestore/src/jvmMain/kotlin/dev/gitlive/firebase/firestore/GeoPoint.kt

@@ -0,0 +1,19 @@
+package dev.gitlive.firebase.firestore
+
+import kotlinx.serialization.Serializable
+
+/** A class representing a platform specific Firebase GeoPoint. */
+actual typealias NativeGeoPoint = com.google.firebase.firestore.GeoPoint
+
+/** A class representing a Firebase GeoPoint. */
+@Serializable(with = GeoPointSerializer::class)
+actual class GeoPoint internal actual constructor(internal actual val nativeValue: NativeGeoPoint) {
+    actual constructor(latitude: Double, longitude: Double) : this(NativeGeoPoint(latitude, longitude))
+    actual val latitude: Double = nativeValue.latitude
+    actual val longitude: Double = nativeValue.longitude
+
+    override fun equals(other: Any?): Boolean =
+        this === other || other is GeoPoint && nativeValue == other.nativeValue
+    override fun hashCode(): Int = nativeValue.hashCode()
+    override fun toString(): String = nativeValue.toString()
+}

firebase-firestore/src/jvmMain/kotlin/dev/gitlive/firebase/firestore/Timestamp.kt

@@ -0,0 +1,35 @@
+@file:JvmName("androidTimestamp")
+package dev.gitlive.firebase.firestore
+
+import kotlinx.serialization.Serializable
+
+/** A class representing a platform specific Firebase Timestamp. */
+actual typealias NativeTimestamp = com.google.firebase.Timestamp
+
+/** A base class that could be used to combine [Timestamp] and [Timestamp.ServerTimestamp] in the same field. */
+@Serializable(with = BaseTimestampSerializer::class)
+actual sealed class BaseTimestamp
+
+/** A class representing a Firebase Timestamp. */
+@Serializable(with = TimestampSerializer::class)
+actual class Timestamp internal actual constructor(
+    internal actual val nativeValue: NativeTimestamp
+): BaseTimestamp() {
+    actual constructor(seconds: Long, nanoseconds: Int) : this(NativeTimestamp(seconds, nanoseconds))
+
+    actual val seconds: Long = nativeValue.seconds
+    actual val nanoseconds: Int = nativeValue.nanoseconds
+
+    override fun equals(other: Any?): Boolean =
+        this === other || other is Timestamp && nativeValue == other.nativeValue
+    override fun hashCode(): Int = nativeValue.hashCode()
+    override fun toString(): String = nativeValue.toString()
+
+    actual companion object {
+        actual fun now(): Timestamp = Timestamp(NativeTimestamp.now())
+    }
+
+    /** A server time timestamp. */
+    @Serializable(with = ServerTimestampSerializer::class)
+    actual object ServerTimestamp: BaseTimestamp()
+}