Use annotationProcessorGeneratedSourcesDirectory when it exists (Grad…

…le 4.3+)
tbroyer · Nov 1, 2017 · e1f4a53 · e1f4a53
1 parent 6a02511
commit e1f4a53
Show file tree

Hide file tree

Showing 2 changed files with 110 additions and 33 deletions.
diff --git a/src/main/java/net/ltgt/gradle/apt/AptPlugin.java b/src/main/java/net/ltgt/gradle/apt/AptPlugin.java
@@ -31,6 +31,8 @@
 public class AptPlugin implements Plugin<Project> {
   private static boolean HAS_ANNOTATION_PROCESSOR_PATH =
       GradleVersion.current().compareTo(GradleVersion.version("3.4")) >= 0;
+  private static boolean HAS_ANNOTATION_PROCESSOR_GENERATED_SOURCES_DIRECTORY =
+      GradleVersion.current().compareTo(GradleVersion.version("4.3")) >= 0;
 
   @Override
   public void apply(final Project project) {
@@ -256,16 +258,26 @@ public void execute(Task task) {
 
                         boolean doUseAnnotationProcessorPath =
                             HAS_ANNOTATION_PROCESSOR_PATH && (task instanceof JavaCompile);
+                        boolean doUseAnnotationProcessorGeneratedSourcesDirectory =
+                            HAS_ANNOTATION_PROCESSOR_GENERATED_SOURCES_DIRECTORY
+                                && (task instanceof JavaCompile);
 
                         CompileOptions compileOptions =
                             getCompileOptions.getCompileOptions((T) task);
                         if (doUseAnnotationProcessorPath) {
                           compileOptions.setAnnotationProcessorPath(
                               aptConvention.aptOptions.getProcessorpath());
                         }
+                        if (doUseAnnotationProcessorGeneratedSourcesDirectory) {
+                          compileOptions.setAnnotationProcessorGeneratedSourcesDirectory(
+                              aptConvention.getGeneratedSourcesDestinationDir());
+                        }
                         compileOptions
                             .getCompilerArgs()
-                            .addAll(aptConvention.buildCompilerArgs(!doUseAnnotationProcessorPath));
+                            .addAll(
+                                aptConvention.buildCompilerArgs(
+                                    !doUseAnnotationProcessorPath,
+                                    !doUseAnnotationProcessorGeneratedSourcesDirectory));
                       }
                     });
               }
@@ -332,9 +344,10 @@ void makeDirectories() {
       }
     }
 
-    List<String> buildCompilerArgs(boolean shouldAddProcessorPath) {
+    List<String> buildCompilerArgs(
+        boolean shouldAddProcessorPath, boolean shouldAddProcessorGeneratedSourcesDirectory) {
       List<String> result = new ArrayList<>();
-      if (generatedSourcesDestinationDir != null) {
+      if (shouldAddProcessorGeneratedSourcesDirectory && generatedSourcesDestinationDir != null) {
         result.add("-s");
         result.add(getGeneratedSourcesDestinationDir().getPath());
       }