grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Error Prone 2.0.21

This commit is contained in:
Eric Anderson 2017-07-06 17:15:20 -07:00
parent 0a36c9d8a3
commit cbad906c0e
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
benchmarks/build.gradle
View File

@ -45,6 +45,11 @@ dependencies {
libraries.math libraries.math
} }
compileJava {
// The Control.Void protobuf clashes
options.compilerArgs += ["-Xep:JavaLangClash:OFF"]
}
compileJmhJava { compileJmhJava {
options.compilerArgs = compileJava.options.compilerArgs options.compilerArgs = compileJava.options.compilerArgs
} }

2
build.gradle
View File

@ -30,7 +30,7 @@ subprojects {
dependencies { dependencies {
// The ErrorProne plugin defaults to the latest, which would break our // The ErrorProne plugin defaults to the latest, which would break our
// build if error prone releases a new version with a new check // build if error prone releases a new version with a new check
errorprone 'com.google.errorprone:error_prone_core:2.0.19' errorprone 'com.google.errorprone:error_prone_core:2.0.21'
} }
} else { } else {
// Remove per-project error-prone checker config // Remove per-project error-prone checker config

2
okhttp/third_party/okhttp/java/io/grpc/okhttp/internal/framed/Http2.java vendored
View File

@ -620,7 +620,7 @@ public final class Http2 implements Variant {
long read = source.read(sink, Math.min(byteCount, left)); long read = source.read(sink, Math.min(byteCount, left));
if (read == -1) return -1; if (read == -1) return -1;
left -= read; left -= (int) read;
return read; return read;
} }

3
protobuf-lite/build.gradle
View File

@ -25,7 +25,8 @@ dependencies {
compileTestJava { compileTestJava {
// Protobuf-generated Lite produces quite a few warnings. // Protobuf-generated Lite produces quite a few warnings.
options.compilerArgs += ["-Xlint:-rawtypes", "-Xlint:-unchecked", "-Xlint:-fallthrough", options.compilerArgs += ["-Xlint:-rawtypes", "-Xlint:-unchecked", "-Xlint:-fallthrough",
"-Xep:MissingOverride:OFF", "-Xep:ReferenceEquality:OFF", "-Xep:FallThrough:OFF"] "-Xep:MissingOverride:OFF", "-Xep:ReferenceEquality:OFF", "-Xep:FallThrough:OFF",
"-Xep:JavaLangClash:OFF" /* The Enum protobuf clashes */]
} }
protobuf { protobuf {