Skip to content

Commit 29ba4eb

Browse files
authored
Upgrade errorprone to latest version. (#70)
* Upgrade errorprone to latest version. * Fix errorprone ComplexBooleanConstant error.
1 parent 8fe4ee6 commit 29ba4eb

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ private static Path randomPath(int maxLen) {
6363
// client. Since this is parsed as empty node without priority on the client, the range merge
6464
// fails. For simplicity (and because priority has a whole bunch of other broken edge cases) we
6565
// will ignore it for now
66-
if (false && addPriority) {
66+
// if (addPriority) {
67+
if (false) {
6768
path = path.child(ChildKey.getPriorityKey());
6869
}
6970
return path;

root-project.gradle

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ buildscript {
2929
dependencies {
3030
classpath 'com.android.tools.build:gradle:3.0.1'
3131
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
32-
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.13'
32+
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.6'
3333
classpath 'org.jsoup:jsoup:1.11.2'
3434
classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.6'
3535
classpath 'com.google.gms:google-services:4.1.0'
@@ -41,6 +41,8 @@ buildscript {
4141
ext {
4242
playServicesVersion = '16.0.1'
4343
supportAnnotationsVersion = '26.1.0'
44+
errorproneVersion = '2.3.2'
45+
errorproneJavacVersion = '9+181-r4173-1'
4446
}
4547

4648
apply plugin: com.google.firebase.gradle.plugins.publish.PublishingPlugin
@@ -55,6 +57,11 @@ configure(subprojects) {
5557
}
5658
}
5759
apply plugin: 'net.ltgt.errorprone'
60+
dependencies {
61+
errorprone "com.google.errorprone:error_prone_core:$errorproneVersion"
62+
errorproneJavac "com.google.errorprone:javac:$errorproneJavacVersion"
63+
64+
}
5865
apply plugin: 'com.github.sherter.google-java-format'
5966
googleJavaFormat {
6067
toolVersion = '1.6'
@@ -77,7 +84,7 @@ configure(subprojects) {
7784
}
7885

7986
tasks.withType(JavaCompile) {
80-
options.compilerArgs += ['-XepExcludedPaths:.*/build/generated/.*']
87+
options.errorprone.excludedPaths = '.*/build/generated/.*'
8188
}
8289

8390
// Adds firebase custom errorprone checks to the annotation processor classpath.

0 commit comments

Comments
 (0)