update Firestore and fix build errors

Author: morganchen12

firestore/app/build.gradle.kts

@@ -42,7 +42,7 @@ dependencies {
     implementation("androidx.multidex:multidex:2.0.1")
 
     // Import the BoM for the Firebase platform
-    implementation(platform("com.google.firebase:firebase-bom:34.4.0"))
+    implementation(platform("com.google.firebase:firebase-bom:34.5.0"))
 
     // Declare the dependency for the Cloud Firestore library
     // When using the BoM, you don't specify versions in Firebase library dependencies

firestore/app/src/main/java/com/google/example/firestore/DocSnippets.java

@@ -24,6 +24,7 @@
 import com.google.firebase.firestore.EventListener;
 import com.google.firebase.firestore.FieldPath;
 import com.google.firebase.firestore.FieldValue;
+import com.google.firebase.firestore.Filter;
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.FirebaseFirestoreSettings;
@@ -1434,7 +1435,7 @@ public void orQueryDisjunctions() {
         // [START 20_disjunctions]
         collection.where(Filter.or(
             Filter.inArray("a", Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)),
-            Filter.inArray("b", Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)),
+            Filter.inArray("b", Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10))
         ));
         // [END 20_disjunctions]
 
@@ -1450,10 +1451,11 @@ public void orQueryDisjunctions() {
     }
 
     public void illegalDisjunctions() {
+        CollectionReference collection = db.collection("cities");
         // [START 50_disjunctions]
         collection.where(Filter.and(
             Filter.inArray("a", Arrays.asList(1, 2, 3, 4, 5)),
-            Filter.inArray("b", Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)),
+            Filter.inArray("b", Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10))
         ));
         // [END 50_disjunctions]
     }

firestore/app/src/main/java/com/google/example/firestore/kotlin/DocSnippets.kt

@@ -8,6 +8,7 @@ import com.google.firebase.firestore.AggregateField
 import com.google.firebase.firestore.AggregateSource
 import com.google.firebase.firestore.DocumentChange
 import com.google.firebase.firestore.FieldValue
+import com.google.firebase.firestore.Filter
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.FirebaseFirestoreException
 import com.google.firebase.firestore.MetadataChanges
@@ -1205,14 +1206,14 @@ abstract class DocSnippets(val db: FirebaseFirestore) {
 
         // [START 20_disjunctions]
         collection.where(Filter.or(
-            Filter.inArray("a", [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]),
-            Filter.inArray("b", [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]),
+            Filter.inArray("a", listOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)),
+            Filter.inArray("b", listOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)),
         ))
         // [END 20_disjunctions]
 
         // [START 10_disjunctions]
         collection.where(Filter.and(
-            Filter.inArray("a", [1, 2, 3, 4, 5]),
+            Filter.inArray("a", listOf(1, 2, 3, 4, 5)),
             Filter.or(
                 Filter.equalTo("b", 2),
                 Filter.equalTo("c", 3)
@@ -1225,8 +1226,8 @@ abstract class DocSnippets(val db: FirebaseFirestore) {
         val collection = db.collection("cities")
         // [START 50_disjunctions]
         collection.where(Filter.and(
-            Filter.inArray("a", [1, 2, 3, 4, 5]),
-            Filter.inArray("b", [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]),
+            Filter.inArray("a", listOf(1, 2, 3, 4, 5)),
+            Filter.inArray("b", listOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)),
         ));
         // [END 50_disjunctions]
     }