From 05b0a46961e66eab904305bafe55671132d8019c Mon Sep 17 00:00:00 2001
From: Jake Wharton <jakewharton@gmail.com>
Date: Tue, 14 Feb 2017 22:28:24 -0500
Subject: [PATCH] Add error-prone compiler. (#259)

* Fix error-prone warning

* Add error-prone compiler.

* Suppress warning about calling getClass() on annotation.
---
 .travis.yml                                      |  6 +++++-
 .../src/main/java/com/squareup/moshi/Types.java  |  2 +-
 .../test/java/com/squareup/moshi/TypesTest.java  |  1 +
 pom.xml                                          | 16 +++++++++++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a616e58..1daa93c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
 language: java
 
 jdk:
-  - oraclejdk7
   - oraclejdk8
 
+addons:
+  apt:
+    packages:
+      - oracle-java8-installer # Updates JDK 8 to the latest available.
+
 after_success:
   - .buildscript/deploy_snapshot.sh
 
diff --git a/moshi/src/main/java/com/squareup/moshi/Types.java b/moshi/src/main/java/com/squareup/moshi/Types.java
index fa8e309..8ae9256 100644
--- a/moshi/src/main/java/com/squareup/moshi/Types.java
+++ b/moshi/src/main/java/com/squareup/moshi/Types.java
@@ -57,7 +57,7 @@ public final class Types {
     }
     for (Annotation annotation : annotations) {
       if (jsonQualifier.equals(annotation.annotationType())) {
-        Set<Annotation> delegateAnnotations = new LinkedHashSet<>(annotations);
+        Set<? extends Annotation> delegateAnnotations = new LinkedHashSet<>(annotations);
         delegateAnnotations.remove(annotation);
         return Collections.unmodifiableSet(delegateAnnotations);
       }
diff --git a/moshi/src/test/java/com/squareup/moshi/TypesTest.java b/moshi/src/test/java/com/squareup/moshi/TypesTest.java
index 199680a..01e38d0 100644
--- a/moshi/src/test/java/com/squareup/moshi/TypesTest.java
+++ b/moshi/src/test/java/com/squareup/moshi/TypesTest.java
@@ -209,6 +209,7 @@ public final class TypesTest {
         .containsExactly(String.class, Integer.class);
   }
 
+  @SuppressWarnings("GetClassOnAnnotation") // Explicitly checking for proxy implementation.
   @Test public void createJsonQualifierImplementation() throws Exception {
     TestQualifier actual = Types.createJsonQualifierImplementation(TestQualifier.class);
     TestQualifier expected =
diff --git a/pom.xml b/pom.xml
index 37c8779..09016e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,11 +80,25 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.0</version>
+          <version>3.3</version>
           <configuration>
+            <compilerId>javac-with-errorprone</compilerId>
+            <forceJavacCompilerUse>true</forceJavacCompilerUse>
             <source>${java.version}</source>
             <target>${java.version}</target>
           </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.codehaus.plexus</groupId>
+              <artifactId>plexus-compiler-javac-errorprone</artifactId>
+              <version>2.8</version>
+            </dependency>
+            <dependency>
+              <groupId>com.google.errorprone</groupId>
+              <artifactId>error_prone_core</artifactId>
+              <version>2.0.15</version>
+            </dependency>
+          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>