From 5dc35e46f8d29dc0b967b81bbc096db86174addd Mon Sep 17 00:00:00 2001
From: Vladimir Kryachko <vkryachko@google.com>
Date: Thu, 11 Oct 2018 14:13:19 -0400
Subject: [PATCH 1/2] Upgrade errorprone to latest version.

---
 root-project.gradle | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/root-project.gradle b/root-project.gradle
index 2d855a88d3e..50350c6eb26 100644
--- a/root-project.gradle
+++ b/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.

From 3d0af007f3ef7ab1f0e8756d4268c0af7588b3e1 Mon Sep 17 00:00:00 2001
From: Vladimir Kryachko <vkryachko@google.com>
Date: Thu, 11 Oct 2018 16:13:24 -0400
Subject: [PATCH 2/2] Fix errorprone ComplexBooleanConstant error.

---
 .../database/snapshot/CompoundHashingIntegrationTest.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/firebase-database/src/androidTest/java/com/google/firebase/database/snapshot/CompoundHashingIntegrationTest.java b/firebase-database/src/androidTest/java/com/google/firebase/database/snapshot/CompoundHashingIntegrationTest.java
index 011170fb4da..f9d0d38c3ea 100644
--- a/firebase-database/src/androidTest/java/com/google/firebase/database/snapshot/CompoundHashingIntegrationTest.java
+++ b/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;