Enable the --source-path and -parameters options to make use of Gradle’s incremental annotation processing

Author: nakamura-to

compile/src/main/groovy/org/seasar/doma/gradle/compile/ConfigureKotlin.groovy

@@ -3,20 +3,15 @@ package org.seasar.doma.gradle.compile
 import org.gradle.api.Project
 import org.gradle.api.tasks.SourceSet
 
-import java.util.function.Supplier
-
 class ConfigureKotlin {
 
     static void configure(Project project, SourceSet sourceSet) {
         project.plugins.withId('kotlin-kapt') {
-            def tasks = project.tasks
             def kapt = project.extensions.getByName('kapt')
-            def compileKotlin = tasks.named('compileKotlin')
-            def dir = compileKotlin.get().destinationDirectory.getAsFile().get()
-            kapt.arguments { arg('doma.resources.dir', dir) }
-            def copyResources = tasks.register(CopyResources.NAME + "Kotlin", CopyResources.class, sourceSet, dir)
-            compileKotlin.configure {
-                dependsOn copyResources
+            def resourceDirs = sourceSet.resources.srcDirs
+            kapt.javacOptions {
+                option '--source-path', resourceDirs.join(File.pathSeparator)
+                option '-parameters', ''
             }
         }
     }

compile/src/main/java/org/seasar/doma/gradle/compile/ConfigureJava.java

@@ -1,29 +1,21 @@
 package org.seasar.doma.gradle.compile;
 
+import java.io.File;
+import java.util.Set;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskContainer;
-import org.gradle.api.tasks.TaskProvider;
 import org.gradle.api.tasks.compile.JavaCompile;
-import org.gradle.language.jvm.tasks.ProcessResources;
 
 public class ConfigureJava {
 
   public static void configure(Project project, SourceSet sourceSet) {
     TaskContainer tasks = project.getTasks();
+    Set<File> resourceDirs = sourceSet.getResources().getSrcDirs();
 
     JavaCompile javaCompile =
         tasks.named(sourceSet.getCompileJavaTaskName(), JavaCompile.class).get();
-    TaskProvider<ProcessResources> processResources =
-        tasks.named(sourceSet.getProcessResourcesTaskName(), ProcessResources.class);
-    TaskProvider<CopyResources> copyResources =
-        tasks.register(
-            CopyResources.NAME + "Java",
-            CopyResources.class,
-            sourceSet,
-            javaCompile.getDestinationDirectory());
-
-    javaCompile.dependsOn(copyResources);
-    processResources.configure(task -> task.exclude(CopyResources.DOMA_RESOURCES));
+    javaCompile.getOptions().setSourcepath(project.files(resourceDirs));
+    javaCompile.getOptions().getCompilerArgs().add("-parameters");
   }
 }