Merge remote-tracking branch 'origin/master' into ss-firestore-emulator-settings

Author: samtstern

buildSrc/src/main/java/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java

@@ -147,7 +147,6 @@ void execute() {
                 args.addAll(Arrays.asList("--baseline", getBaselineFile().getAbsolutePath()));
               }
               spec.setArgs(args);
-              spec.setIgnoreExitValue(true);
               try {
                 spec.setStandardOutput(new FileOutputStream(getOutputFile()));
               } catch (FileNotFoundException e) {

firebase-database/api.txt

@@ -187,9 +187,9 @@ package com.google.firebase.database {
 
   public class ServerValue {
     ctor public ServerValue();
+    method @NonNull public static final Object increment(long);
+    method @NonNull public static final Object increment(double);
     field @NonNull public static final java.util.Map<java.lang.String,java.lang.String> TIMESTAMP;
-    field @NonNull public static final Object increment(double);
-    field @NonNull public static final Object increment(long);
   }
 
   @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public @interface ThrowOnExtraProperties {