Merge branch 'master' into encode-defaults

Author: nbransby

build.gradle.kts

@@ -26,8 +26,8 @@ val minSdkVersion by extra(16)
 tasks {
     val downloadIOSFirebaseZipFile by creating(Download::class) {
         onlyIfModified(true)
-        src("https://github.com/firebase/firebase-ios-sdk/releases/download/6.17.0/Firebase-6.17.0.zip")
-        dest(File("$buildDir", "Firebase-6.17.0.zip"))
+        src("https://github.com/firebase/firebase-ios-sdk/releases/download/6.23.0/Firebase-6.23.0.zip")
+        dest(File("$buildDir", "Firebase-6.23.0.zip"))
         overwrite(true)
 
     }

firebase-firestore/build.gradle.kts

@@ -58,7 +58,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("com.google.firebase:firebase-firestore:19.0.2")
+                api("com.google.firebase:firebase-firestore:21.4.3")
             }
         }
 

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

@@ -295,6 +295,13 @@ actual open class Query(open val android: com.google.firebase.firestore.Query) {
             }
         }
     )
+
+    internal actual fun _where(field: String, arrayContainsAny: List<Any>) = Query(
+        android.whereArrayContainsAny(field, arrayContainsAny)
+    )
+    internal actual fun _where(path: FieldPath, arrayContainsAny: List<Any>) = Query(
+        android.whereArrayContainsAny(path, arrayContainsAny)
+    )
 }
 
 actual class CollectionReference(override val android: com.google.firebase.firestore.CollectionReference) : Query(android) {

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

@@ -60,6 +60,8 @@ expect open class Query {
     internal fun _where(path: FieldPath, equalTo: Any?): Query
     internal fun _where(field: String, lessThan: Any? = null, greaterThan: Any? = null, arrayContains: Any? = null): Query
     internal fun _where(path: FieldPath, lessThan: Any? = null, greaterThan: Any? = null, arrayContains: Any? = null): Query
+    internal fun _where(field: String, arrayContainsAny: List<Any>): Query
+    internal fun _where(path: FieldPath, arrayContainsAny: List<Any>): Query
     val snapshots: Flow<QuerySnapshot>
     suspend fun get(): QuerySnapshot
 }
@@ -68,6 +70,8 @@ fun Query.where(field: String, equalTo: Any?) = _where(field, equalTo)
 fun Query.where(path: FieldPath, equalTo: Any?) = _where(path, equalTo)
 fun Query.where(field: String, lessThan: Any? = null, greaterThan: Any? = null, arrayContains: Any? = null) = _where(field, lessThan, greaterThan, arrayContains)
 fun Query.where(path: FieldPath, lessThan: Any? = null, greaterThan: Any? = null, arrayContains: Any? = null) = _where(path, lessThan, greaterThan, arrayContains)
+fun Query.where(field: String, arrayContainsAny: List<Any>) = _where(field, arrayContainsAny)
+fun Query.where(path: FieldPath, arrayContainsAny: List<Any>) = _where(path, arrayContainsAny)
 
 
 expect class WriteBatch {

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

@@ -203,6 +203,13 @@ actual open class Query(open val ios: FIRQuery) {
             }
         }
     )
+
+    internal actual fun _where(field: String, arrayContainsAny: List<Any>) = Query(
+        ios.queryWhereField(field, arrayContainsAny = arrayContainsAny)
+    )
+    internal actual fun _where(path: FieldPath, arrayContainsAny: List<Any>) = Query(
+        ios.queryWhereFieldPath(path, arrayContainsAny = arrayContainsAny)
+    )
 }
 actual class CollectionReference(override val ios: FIRCollectionReference) : Query(ios) {
 

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

@@ -269,6 +269,13 @@ actual open class Query(open val js: firebase.firestore.Query) {
         )
     }
 
+    internal actual fun _where(field: String, arrayContainsAny: List<Any>) = rethrow {
+        Query(js.where(field, "array-contains-any", arrayContainsAny))
+    }
+    internal actual fun _where(path: FieldPath, arrayContainsAny: List<Any>) = rethrow {
+        Query(js.where(path, "array-contains-any", arrayContainsAny))
+    }
+
     actual val snapshots get() = callbackFlow {
         val unsubscribe = rethrow {
             js.onSnapshot(