From 8323f24ccc4b93124c33c2b3c2988952bf391944 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 20 Sep 2022 11:29:18 +0100 Subject: [PATCH] Make classes generated by AOT test processing available to nativeTest Closes gh-32428 --- .../boot/gradle/plugin/SpringBootAotPlugin.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 207697a4f3..371e6ef975 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 @@ -149,12 +149,15 @@ public class SpringBootAotPlugin implements Plugin { JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class); SourceSetContainer sourceSets = javaPluginExtension.getSourceSets(); SourceSet testSourceSet = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME); + Provider aotTestClasses = project.getLayout().getBuildDirectory().dir("generated/aotTestClasses"); TaskProvider processTestAot = project.getTasks().register(PROCESS_TEST_AOT_TASK_NAME, ProcessTestAot.class, (task) -> { - configureAotTask(project, aotTestSourceSet, task, - project.getLayout().getBuildDirectory().dir("generated/aotTestClasses")); + configureAotTask(project, aotTestSourceSet, task, aotTestClasses); task.setTestSourceSet(testSourceSet); }); + project.getDependencies().add(aotTestSourceSet.getImplementationConfigurationName(), + project.files(aotTestClasses)); + aotTestSourceSet.getOutput().dir(aotTestClasses); configureDependsOn(project, aotTestSourceSet, processTestAot); }