Merge pull request #81 from robert3005/rk/annotationprocessor

palantir · Sep 5, 2018 · 15b7b90 · 15b7b90
2 parents b27d725 + 20a312a
commit 15b7b90
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/src/main/groovy/org/inferred/gradle/ProcessorsPlugin.groovy b/src/main/groovy/org/inferred/gradle/ProcessorsPlugin.groovy
@@ -24,9 +24,15 @@ class ProcessorsPlugin implements Plugin<Project> {
 
   void apply(Project project) {
 
-    project.configurations.create('processor')
+    def processorConf = project.configurations.create('processor')
     project.extensions.create('processors', ProcessorsExtension)
 
+    // compat with gradle 4.6 annotationProcessor
+    def annotationProcessor = project.configurations.findByName('annotationProcessor')
+    if (annotationProcessor != null) {
+      processorConf.extendsFrom(annotationProcessor)
+    }
+
     /**** javac, groovy, etc. *********************************************************************/
     project.plugins.withType(JavaPlugin, { plugin ->
       def convention = project.convention.plugins['java'] as JavaPluginConvention

diff --git a/src/test/groovy/org/inferred/gradle/ProcessorsPluginFunctionalTest.groovy b/src/test/groovy/org/inferred/gradle/ProcessorsPluginFunctionalTest.groovy
@@ -57,6 +57,37 @@ public class ProcessorsPluginFunctionalTest {
         .build()
   }
 
+  @Test
+  public void testAnnotationProcessor() throws IOException {
+    buildFile << """
+      apply plugin: 'java'
+      apply plugin: 'org.inferred.processors'
+
+      dependencies {
+        annotationProcessor 'com.google.auto.value:auto-value:1.0'
+      }
+    """
+
+    new File(testProjectDir.newFolder('src', 'main', 'java'), 'MyClass.java') << """
+      import com.google.auto.value.AutoValue;
+
+      @AutoValue
+      public abstract class MyClass {
+        public abstract int getValue();
+
+        public static MyClass create(int value) {
+          return new AutoValue_MyClass(value);
+        }
+      }
+    """
+
+    GradleRunner.create()
+            .withProjectDir(testProjectDir.getRoot())
+            .withArguments("compileJava")
+            .withGradleVersion("4.6")
+            .build()
+  }
+
   @Test
   public void testJavaCompilation_processorsFirst() throws IOException {
     buildFile << """