Merge branch 'master' into mlLogging2

Author: annzimmer

.github/ISSUE_TEMPLATE/bug.md

@@ -39,4 +39,4 @@ This could be a description, log/console output, etc.
 
 ```
 // TODO(you): code here to reproduce the problem
-```
+```

build.gradle

@@ -62,7 +62,7 @@ apply plugin: com.google.firebase.gradle.plugins.ci.metrics.MetricsPlugin
 firebaseContinuousIntegration {
     ignorePaths = [
             /.*\.gitignore$/,
-            /.*.md$/,
+            /.*\/.*.md$/,
     ]
 }
 

encoders/firebase-encoders-json/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=17.0.1
-latestReleasedVersion=17.0.0
+version=17.1.1
+latestReleasedVersion=17.1.0

encoders/firebase-encoders/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.0.1
-latestReleasedVersion=16.0.0
+version=16.1.1
+latestReleasedVersion=16.1.0

firebase-annotations/gradle.properties

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.0.0
+version=16.0.1

firebase-common/gradle.properties

@@ -1,3 +1,3 @@
-version=19.4.1
-latestReleasedVersion=19.4.0
+version=19.5.1
+latestReleasedVersion=19.5.0
 android.enableUnitTestBinaryResources=true

firebase-components/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.0.2
-latestReleasedVersion=16.0.1
+version=16.1.1
+latestReleasedVersion=16.1.0

firebase-components/src/main/java/com/google/firebase/components/ComponentDiscovery.java

@@ -125,7 +125,7 @@ private static ComponentRegistrar instantiate(String registrarName) {
       }
       return (ComponentRegistrar) loadedClass.getDeclaredConstructor().newInstance();
     } catch (ClassNotFoundException e) {
-      Log.w(TAG, String.format("Class %s is not an found.", registrarName), e);
+      Log.w(TAG, String.format("Class %s is not an found.", registrarName));
       return null;
     } catch (IllegalAccessException e) {
       throw new InvalidRegistrarException(

firebase-config/gradle.properties

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version=20.0.2
-latestReleasedVersion=20.0.1
+version=20.0.3
+latestReleasedVersion=20.0.2
 android.enableUnitTestBinaryResources=true
 

firebase-database/gradle.properties

@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=19.5.2
-latestReleasedVersion=19.5.1
+version=19.6.1
+latestReleasedVersion=19.6.0
 android.enableUnitTestBinaryResources=true

firebase-database/src/main/java/com/google/firebase/database/Query.java

@@ -163,8 +163,8 @@ public ChildEventListener addChildEventListener(@NonNull ChildEventListener list
   }
 
   /**
-   * Gets the server values for this query. Updates the cache and raises events if successful. If not
-   * connected, falls back to a locally-cached value.
+   * Gets the server values for this query. Updates the cache and raises events if successful. If
+   * not connected, falls back to a locally-cached value.
    */
   @NonNull
   public Task<DataSnapshot> get() {

firebase-datatransport/gradle.properties

@@ -1,3 +1,3 @@
-version=17.0.10
-latestReleasedVersion=17.0.9
+version=17.0.11
+latestReleasedVersion=17.0.10
 android.enableUnitTestBinaryResources=true

firebase-firestore/CHANGELOG.md

@@ -3,6 +3,10 @@
   This more closely aligns the SDK with the Firestore backend, which has always
   accepted null and NaN for all operators, even though this isn't necessarily
   useful.
+- [changed] A write to a document that contains FieldValue transforms is no
+  longer split up into two separate operations. This reduces the number of
+  writes the backend performs and allows each WriteBatch to hold 500 writes
+  regardless of how many FieldValue transformations are attached.
 
 # (22.0.0)
 - [changed] Removed the deprecated `timestampsInSnapshotsEnabled` setting.

firebase-firestore/gradle.properties

@@ -1,2 +1,2 @@
-version=22.0.1
-latestReleasedVersion=22.0.0
+version=22.0.2
+latestReleasedVersion=22.0.1

firebase-firestore/src/main/java/com/google/firebase/firestore/DocumentReference.java

@@ -42,6 +42,7 @@
 import com.google.firebase.firestore.util.Assert;
 import com.google.firebase.firestore.util.Executors;
 import com.google.firebase.firestore.util.Util;
+import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
@@ -166,7 +167,7 @@ public Task<Void> set(@NonNull Object data, @NonNull SetOptions options) {
             : firestore.getUserDataReader().parseSetData(data);
     return firestore
         .getClient()
-        .write(parsed.toMutationList(key, Precondition.NONE))
+        .write(Collections.singletonList(parsed.toMutation(key, Precondition.NONE)))
         .continueWith(Executors.DIRECT_EXECUTOR, voidErrorTransformer());
   }
 
@@ -230,7 +231,7 @@ public Task<Void> update(
   private Task<Void> update(@NonNull ParsedUpdateData parsedData) {
     return firestore
         .getClient()
-        .write(parsedData.toMutationList(key, Precondition.exists(true)))
+        .write(Collections.singletonList(parsedData.toMutation(key, Precondition.exists(true))))
         .continueWith(Executors.DIRECT_EXECUTOR, voidErrorTransformer());
   }
 

firebase-firestore/src/main/java/com/google/firebase/firestore/LoadBundleTask.java

@@ -0,0 +1,197 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.firestore;
+
+import android.app.Activity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.gms.tasks.Continuation;
+import com.google.android.gms.tasks.OnCanceledListener;
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.android.gms.tasks.SuccessContinuation;
+import com.google.android.gms.tasks.Task;
+import java.util.concurrent.Executor;
+
+/* package */ class LoadBundleTask extends Task<LoadBundleTaskProgress> {
+  @Override
+  public boolean isComplete() {
+    return false;
+  }
+
+  @Override
+  public boolean isSuccessful() {
+    return false;
+  }
+
+  @Override
+  public boolean isCanceled() {
+    return false;
+  }
+
+  @Nullable
+  @Override
+  public LoadBundleTaskProgress getResult() {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public <X extends Throwable> LoadBundleTaskProgress getResult(@NonNull Class<X> aClass) throws X {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public Exception getException() {
+    return null;
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnSuccessListener(
+      @NonNull OnSuccessListener<? super LoadBundleTaskProgress> onSuccessListener) {
+    return null;
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnSuccessListener(
+      @NonNull Executor executor,
+      @NonNull OnSuccessListener<? super LoadBundleTaskProgress> onSuccessListener) {
+    return null;
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnSuccessListener(
+      @NonNull Activity activity,
+      @NonNull OnSuccessListener<? super LoadBundleTaskProgress> onSuccessListener) {
+    return null;
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnFailureListener(
+      @NonNull OnFailureListener onFailureListener) {
+    return null;
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnFailureListener(
+      @NonNull Executor executor, @NonNull OnFailureListener onFailureListener) {
+    return null;
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnFailureListener(
+      @NonNull Activity activity, @NonNull OnFailureListener onFailureListener) {
+    return null;
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnCompleteListener(
+      @NonNull OnCompleteListener<LoadBundleTaskProgress> onCompleteListener) {
+    return super.addOnCompleteListener(onCompleteListener);
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnCompleteListener(
+      @NonNull Executor executor,
+      @NonNull OnCompleteListener<LoadBundleTaskProgress> onCompleteListener) {
+    return super.addOnCompleteListener(executor, onCompleteListener);
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnCompleteListener(
+      @NonNull Activity activity,
+      @NonNull OnCompleteListener<LoadBundleTaskProgress> onCompleteListener) {
+    return super.addOnCompleteListener(activity, onCompleteListener);
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnCanceledListener(
+      @NonNull OnCanceledListener onCanceledListener) {
+    return super.addOnCanceledListener(onCanceledListener);
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnCanceledListener(
+      @NonNull Executor executor, @NonNull OnCanceledListener onCanceledListener) {
+    return super.addOnCanceledListener(executor, onCanceledListener);
+  }
+
+  @NonNull
+  @Override
+  public Task<LoadBundleTaskProgress> addOnCanceledListener(
+      @NonNull Activity activity, @NonNull OnCanceledListener onCanceledListener) {
+    return super.addOnCanceledListener(activity, onCanceledListener);
+  }
+
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> continueWith(
+      @NonNull Continuation<LoadBundleTaskProgress, TContinuationResult> continuation) {
+    return super.continueWith(continuation);
+  }
+
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> continueWith(
+      @NonNull Executor executor,
+      @NonNull Continuation<LoadBundleTaskProgress, TContinuationResult> continuation) {
+    return super.continueWith(executor, continuation);
+  }
+
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> continueWithTask(
+      @NonNull Continuation<LoadBundleTaskProgress, Task<TContinuationResult>> continuation) {
+    return super.continueWithTask(continuation);
+  }
+
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> continueWithTask(
+      @NonNull Executor executor,
+      @NonNull Continuation<LoadBundleTaskProgress, Task<TContinuationResult>> continuation) {
+    return super.continueWithTask(executor, continuation);
+  }
+
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> onSuccessTask(
+      @NonNull
+          SuccessContinuation<LoadBundleTaskProgress, TContinuationResult> successContinuation) {
+    return super.onSuccessTask(successContinuation);
+  }
+
+  @NonNull
+  @Override
+  public <TContinuationResult> Task<TContinuationResult> onSuccessTask(
+      @NonNull Executor executor,
+      @NonNull
+          SuccessContinuation<LoadBundleTaskProgress, TContinuationResult> successContinuation) {
+    return super.onSuccessTask(executor, successContinuation);
+  }
+}