Merge branch 'master' into mikelehen/pojo-field-writes

Author: Michael Lehenbauer

firebase-database/src/androidTest/java/com/google/firebase/database/snapshot/CompoundHashingIntegrationTest.java

@@ -63,7 +63,8 @@ private static Path randomPath(int maxLen) {
     // client. Since this is parsed as empty node without priority on the client, the range merge
     // fails. For simplicity (and because priority has a whole bunch of other broken edge cases) we
     // will ignore it for now
-    if (false && addPriority) {
+    // if (addPriority) {
+    if (false) {
       path = path.child(ChildKey.getPriorityKey());
     }
     return path;

firebase-firestore/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Unreleased
+
+# 17.1.2
 - [changed] Changed the internal handling for locally updated documents that
   haven't yet been read back from Cloud Firestore. This can lead to slight
   behavior changes and may affect the `SnapshotMetadata.hasPendingWrites()`

firebase-firestore/src/proto/google/firebase/firestore/proto/maybe_document.proto

@@ -34,7 +34,8 @@ message NoDocument {
   google.protobuf.Timestamp read_time = 2;
 }
 
-// A message indicating that the document that is known to exist but its data is unknown.
+// A message indicating that the document that is known to exist but its data
+// is unknown.
 message UnknownDocument {
   // The name of the document that is known to exist, in the standard format:
   // `projects/{project_id}/databases/{database_id}/documents/{document_path}`
@@ -44,8 +45,9 @@ message UnknownDocument {
   google.protobuf.Timestamp version = 2;
 }
 
-// Represents either an existing document, the explicitly known absence of a document, or a document
-// that is known to exist (at some version) but whose contents are unknown
+// Represents either an existing document, the explicitly known absence of a
+// document, or a document that is known to exist (at some version) but whose
+// contents are unknown.
 message MaybeDocument {
   oneof document_type {
     // Used if the document is known to not exist.
@@ -54,12 +56,13 @@ message MaybeDocument {
     // The document (if it exists).
     google.firestore.v1beta1.Document document = 2;
 
-    // Used if the document is known to exist but its data is unknown
+    // Used if the document is known to exist but its data is unknown.
     UnknownDocument unknown_document = 3;
   }
 
-  // `hasCommittedMutations` marks documents that were written to the remote socument store based
-  // on a write acknowledgment. These documents are potentially inconsistent with the  backend's
-  // copy and use the write's commit version as their document version.
-  bool hasCommittedMutations = 4;
+  // `has_committed_mutations` marks documents that were written to the remote
+  // document store based on a write acknowledgment. These documents are
+  // potentially inconsistent with the backend's copy and use the write's
+  // commit version as their document version.
+  bool has_committed_mutations = 4;
 }

root-project.gradle

@@ -29,7 +29,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
-        classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.13'
+        classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.6'
         classpath 'org.jsoup:jsoup:1.11.2'
         classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.6'
         classpath 'com.google.gms:google-services:4.1.0'
@@ -41,6 +41,8 @@ buildscript {
 ext {
     playServicesVersion = '16.0.1'
     supportAnnotationsVersion = '26.1.0'
+    errorproneVersion = '2.3.2'
+    errorproneJavacVersion = '9+181-r4173-1'
 }
 
 apply plugin: com.google.firebase.gradle.plugins.publish.PublishingPlugin
@@ -55,6 +57,11 @@ configure(subprojects) {
         }
     }
     apply plugin: 'net.ltgt.errorprone'
+    dependencies {
+        errorprone "com.google.errorprone:error_prone_core:$errorproneVersion"
+        errorproneJavac "com.google.errorprone:javac:$errorproneJavacVersion"
+
+    }
     apply plugin: 'com.github.sherter.google-java-format'
     googleJavaFormat {
         toolVersion = '1.6'
@@ -77,7 +84,7 @@ configure(subprojects) {
     }
 
     tasks.withType(JavaCompile) {
-        options.compilerArgs += ['-XepExcludedPaths:.*/build/generated/.*']
+        options.errorprone.excludedPaths = '.*/build/generated/.*'
     }
 
     // Adds firebase custom errorprone checks to the annotation processor classpath.