Merge branch 'master' into feature/firestore-settings

Author: nbransby

.github/workflows/pull_request.yml

@@ -85,7 +85,7 @@ jobs:
           name: "Firebase Debug Log"
           path: "**/firebase-debug.log"
   build-ios:
-    runs-on: macos-13
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
       - name: Cocoapods cache
@@ -112,4 +112,4 @@ jobs:
         if: failure()
         with:
           name: "Firebase Debug Log"
-          path: "**/firebase-debug.log"
+          path: "**/firebase-debug.log"

firebase-app/build.gradle.kts

@@ -87,7 +87,7 @@ kotlin {
             }
             noPodspec()
             pod("FirebaseCore") {
-                version = "10.19.0"
+                version = "10.23.0"
             }
         }
     }

firebase-auth/build.gradle.kts

@@ -91,7 +91,7 @@ kotlin {
             }
             noPodspec()
             pod("FirebaseAuth") {
-                version = "10.19.0"
+                version = "10.23.0"
             }
         }
     }

firebase-config/build.gradle.kts

@@ -104,7 +104,7 @@ kotlin {
             }
             noPodspec()
             pod("FirebaseRemoteConfig") {
-                version = "10.19.0"
+                version = "10.23.0"
             }
         }
     }

firebase-crashlytics/build.gradle.kts

@@ -91,7 +91,8 @@ kotlin {
             }
             noPodspec()
             pod("FirebaseCrashlytics") {
-                version = "10.19.0"
+                version = "10.23.0"
+                extraOpts += listOf("-compiler-option", "-fmodules")
             }
         }
     }

firebase-database/build.gradle.kts

@@ -96,7 +96,7 @@ kotlin {
             }
             noPodspec()
             pod("FirebaseDatabase") {
-                version = "10.19.0"
+                version = "10.23.0"
             }
         }
     }

firebase-firestore/build.gradle.kts

@@ -95,10 +95,10 @@ kotlin {
             // As of Firebase 10.17 Firestore has moved all ObjC headers to FirebaseFirestoreInternal and the kotlin cocoapods plugin does not handle this well
             // Adding it manually seems to resolve the issue
             pod("FirebaseFirestoreInternal") {
-                version = "10.19.0"
+                version = "10.23.0"
             }
             pod("FirebaseFirestore") {
-                version = "10.19.0"
+                version = "10.23.0"
                 extraOpts += listOf("-compiler-option", "-fmodules")
                 useInteropBindingFrom("FirebaseFirestoreInternal")
             }

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

@@ -477,13 +477,18 @@ actual class SnapshotMetadata(val android: com.google.firebase.firestore.Snapsho
 }
 
 actual class FieldPath private constructor(val android: com.google.firebase.firestore.FieldPath) {
+
+    actual companion object {
+        actual val documentId = FieldPath(com.google.firebase.firestore.FieldPath.documentId())
+    }
+
     actual constructor(vararg fieldNames: String) : this(
         com.google.firebase.firestore.FieldPath.of(
             *fieldNames
         )
     )
 
-    actual val documentId: FieldPath get() = FieldPath(com.google.firebase.firestore.FieldPath.documentId())
+    actual val documentId: FieldPath get() = FieldPath.documentId
     actual val encoded: EncodedFieldPath = android
     override fun equals(other: Any?): Boolean = other is FieldPath && android == other.android
     override fun hashCode(): Int = android.hashCode()

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

@@ -591,6 +591,10 @@ expect class SnapshotMetadata {
 }
 
 expect class FieldPath(vararg fieldNames: String) {
+    companion object {
+        val documentId: FieldPath
+    }
+    @Deprecated("Use companion object instead", replaceWith = ReplaceWith("FieldPath.documentId"))
     val documentId: FieldPath
     val encoded: EncodedFieldPath
 }

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

@@ -658,7 +658,6 @@ class FirebaseFirestoreTest {
         assertEquals(setOf(DocumentWithTimestamp(futureTimestamp)), gtQueryResult)
     }
 
-
     @Test
     fun testGeoPointSerialization() = runTest {
         @Serializable
@@ -1017,6 +1016,16 @@ class FirebaseFirestoreTest {
         andOrQuery.assertDocuments(FirestoreTest.serializer(), testOne)
     }
 
+    @Test
+    fun testQueryByDocumentId() = runTest {
+        setupFirestoreData()
+
+        val fieldQuery = firestore
+            .collection("testFirestoreQuerying")
+            .where { FieldPath.documentId equalTo "one" }
+        fieldQuery.assertDocuments(FirestoreTest.serializer(), testOne)
+    }
+
     private suspend fun setupFirestoreData(
         documentOne: FirestoreTest = testOne,
         documentTwo: FirestoreTest = testTwo,