From ee12cc2a34d8cc6d64c576d1b52d4b8db81390d7 Mon Sep 17 00:00:00 2001
From: Carl Mastrangelo <notcarl@google.com>
Date: Wed, 22 Mar 2017 22:09:04 -0700
Subject: [PATCH] all: update to latest version of errorprone

---
 .../src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java  | 1 +
 .../src/main/java/io/grpc/benchmarks/qps/AsyncServer.java    | 1 +
 build.gradle                                                 | 4 ++--
 compiler/build.gradle                                        | 3 ++-
 netty/build.gradle                                           | 5 +++++
 protobuf-lite/build.gradle                                   | 2 +-
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/benchmarks/src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java b/benchmarks/src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java
index 2614e3b96f..013dd08d2c 100644
--- a/benchmarks/src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java
+++ b/benchmarks/src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java
@@ -86,6 +86,7 @@ public class TransportBenchmark {
   private volatile EventLoopGroup groupToShutdown;
 
   @Setup
+  @SuppressWarnings("LiteralClassName") // Epoll is not available on windows
   public void setUp() throws Exception {
     AbstractServerImplBuilder<?> serverBuilder;
     AbstractManagedChannelImplBuilder<?> channelBuilder;
diff --git a/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncServer.java b/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncServer.java
index 95b305b28a..a94c45a33f 100644
--- a/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncServer.java
+++ b/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncServer.java
@@ -99,6 +99,7 @@ public class AsyncServer {
     });
   }
 
+  @SuppressWarnings("LiteralClassName") // Epoll is not available on windows
   static Server newServer(ServerConfiguration config) throws IOException {
     SslContext sslContext = null;
     if (config.tls) {
diff --git a/build.gradle b/build.gradle
index 64d37b8892..70097f9b47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -155,7 +155,7 @@ subprojects {
             epoll_suffix = ":" + osdetector.classifier
         }
         libraries = [
-                errorprone: "com.google.errorprone:error_prone_annotations:2.0.11",
+                errorprone: "com.google.errorprone:error_prone_annotations:2.0.19",
                 guava: "com.google.guava:guava:${guavaVersion}",
                 hpack: 'com.twitter:hpack:0.10.1',
                 jsr305: 'com.google.code.findbugs:jsr305:3.0.0',
@@ -207,7 +207,7 @@ subprojects {
 
         // The ErrorProne plugin defaults to the latest, which would break our
         // build if error prone releases a new version with a new check
-        errorprone 'com.google.errorprone:error_prone_core:2.0.15'
+        errorprone 'com.google.errorprone:error_prone_core:2.0.19'
     }
 
     signing {
diff --git a/compiler/build.gradle b/compiler/build.gradle
index a8a8423d0e..10d9c315bc 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -149,7 +149,8 @@ compileTestJava {
 compileTestLiteJava {
   // Protobuf-generated Lite produces quite a few warnings.
   options.compilerArgs += ["-Xlint:-rawtypes", "-Xlint:-unchecked",
-      "-Xep:MissingOverride:OFF", "-Xep:ReferenceEquality:OFF"]
+      "-Xep:MissingOverride:OFF", "-Xep:ReferenceEquality:OFF",
+      "-Xep:FallThrough:OFF"]
 }
 
 compileTestNanoJava {
diff --git a/netty/build.gradle b/netty/build.gradle
index a8197af47b..a06e63e1f7 100644
--- a/netty/build.gradle
+++ b/netty/build.gradle
@@ -11,6 +11,11 @@ dependencies {
     signature "org.codehaus.mojo.signature:java17:+@signature"
 }
 
+[compileJava, compileTestJava].each() {
+  // Netty retuns a lot of futures that we mostly don't care about.
+  it.options.compilerArgs += ["-Xep:FutureReturnValueIgnored:OFF"]
+}
+
 javadoc.options.links 'http://netty.io/4.1/api/'
 
 project.sourceSets {
diff --git a/protobuf-lite/build.gradle b/protobuf-lite/build.gradle
index 84a8390f44..39af071dbb 100644
--- a/protobuf-lite/build.gradle
+++ b/protobuf-lite/build.gradle
@@ -25,7 +25,7 @@ dependencies {
 compileTestJava {
   // Protobuf-generated Lite produces quite a few warnings.
   options.compilerArgs += ["-Xlint:-rawtypes", "-Xlint:-unchecked", "-Xlint:-fallthrough",
-        "-Xep:MissingOverride:OFF", "-Xep:ReferenceEquality:OFF"]
+        "-Xep:MissingOverride:OFF", "-Xep:ReferenceEquality:OFF", "-Xep:FallThrough:OFF"]
 }
 
 protobuf {