diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java index 0e782c9379..418e87bbc1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java @@ -138,7 +138,7 @@ public class SpringBootAotPlugin implements Plugin { task.getClassesOutput().set(generatedClasses); task.getGroupId().set(project.provider(() -> String.valueOf(project.getGroup()))); task.getArtifactId().set(project.provider(() -> project.getName())); - task.setInputClasses(inputSourceSet.getOutput().getClassesDirs()); + task.setClasspathRoots(inputSourceSet.getOutput().getClassesDirs()); } private void configureDependsOn(Project project, SourceSet aotSourceSet, diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/aot/AbstractAot.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/aot/AbstractAot.java index 0a86342b76..eb1a20d0b1 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/aot/AbstractAot.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/aot/AbstractAot.java @@ -21,6 +21,7 @@ import java.util.List; import org.gradle.api.file.DirectoryProperty; import org.gradle.api.file.FileCollection; +import org.gradle.api.file.FileTree; import org.gradle.api.provider.Property; import org.gradle.api.tasks.IgnoreEmptyDirectories; import org.gradle.api.tasks.Input; @@ -52,7 +53,7 @@ public abstract class AbstractAot extends JavaExec { private final Property artifactId; - private FileCollection inputClasses; + private FileCollection classpathRoots; protected AbstractAot() { this.sourcesDir = getProject().getObjects().directoryProperty(); @@ -87,16 +88,22 @@ public abstract class AbstractAot extends JavaExec { return this.classesDir; } + @InputFiles + @PathSensitive(PathSensitivity.RELATIVE) + public final FileCollection getClasspathRoots() { + return this.classpathRoots; + } + @InputFiles @SkipWhenEmpty @IgnoreEmptyDirectories @PathSensitive(PathSensitivity.RELATIVE) - public final FileCollection getInputClasses() { - return this.inputClasses.getAsFileTree(); + final FileTree getInputClasses() { + return this.classpathRoots.getAsFileTree(); } - public void setInputClasses(FileCollection inputClasses) { - this.inputClasses = inputClasses; + public void setClasspathRoots(FileCollection classpathRoots) { + this.classpathRoots = classpathRoots; } List processorArgs() { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/aot/ProcessTestAot.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/aot/ProcessTestAot.java index d4626e7288..e4ae58d611 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/aot/ProcessTestAot.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/aot/ProcessTestAot.java @@ -69,7 +69,7 @@ public class ProcessTestAot extends AbstractAot { @TaskAction public void exec() { List args = new ArrayList<>(); - args.add(this.getInputClasses().getFiles().stream().filter(File::exists).map(File::getAbsolutePath) + args.add(this.getClasspathRoots().getFiles().stream().filter(File::exists).map(File::getAbsolutePath) .collect(Collectors.joining(File.pathSeparator))); args.addAll(processorArgs()); this.setArgs(args);