Skip to content

Commit 293a3c9

Browse files
committed
Fix arguments passed to AOT processing in Gradle plugin
See gh-30527
1 parent 8cf63a2 commit 293a3c9

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@
2222
import org.gradle.api.Project;
2323
import org.gradle.api.artifacts.Configuration;
2424
import org.gradle.api.artifacts.ConfigurationContainer;
25+
import org.gradle.api.file.Directory;
2526
import org.gradle.api.plugins.JavaPlugin;
2627
import org.gradle.api.plugins.JavaPluginExtension;
2728
import org.gradle.api.plugins.PluginContainer;
29+
import org.gradle.api.provider.Provider;
2830
import org.gradle.api.tasks.SourceSet;
2931
import org.gradle.api.tasks.SourceSetContainer;
3032
import org.gradle.api.tasks.TaskProvider;
@@ -82,10 +84,14 @@ private void registerGenerateAotSourcesTask(Project project, SourceSet aotSource
8284
.named(SpringBootPlugin.RESOLVE_MAIN_CLASS_NAME_TASK_NAME, ResolveMainClassName.class);
8385
TaskProvider<GenerateAotSources> generateAotSources = project.getTasks()
8486
.register(GENERATE_AOT_SOURCES_TASK_NAME, GenerateAotSources.class, (task) -> {
87+
Provider<Directory> generatedClasses = project.getLayout().getBuildDirectory()
88+
.dir(GENERATE_AOT_SOURCES_TASK_NAME);
89+
aotSourceSet.getOutput().dir(generatedClasses);
8590
task.getApplicationClass().set(resolveMainClassName.flatMap((thing) -> thing.readMainClassName()));
8691
task.setClasspath(aotSourceSet.getCompileClasspath());
8792
task.getSourcesDir().set(aotSourceSet.getJava().getSrcDirs().iterator().next());
8893
task.getResourcesDir().set(aotSourceSet.getResources().getSrcDirs().iterator().next());
94+
task.getClassesDir().set(generatedClasses);
8995
task.getGroupId().set(project.provider(() -> String.valueOf(project.getGroup())));
9096
task.getArtifactId().set(project.provider(() -> project.getName()));
9197
});

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/aot/GenerateAotSources.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ public void exec() {
9696
args.add(this.sourcesDir.getAsFile().get().getAbsolutePath());
9797
args.add(this.resourcesDir.getAsFile().get().getAbsolutePath());
9898
args.add(this.classesDir.getAsFile().get().getAbsolutePath());
99+
args.add(this.groupId.get());
100+
args.add(this.artifactId.get());
99101
args.addAll(super.getArgs());
100102
this.setArgs(args);
101103
super.exec();

0 commit comments

Comments
 (0)