mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.0.x' into 3.1.x
Closes gh-37826
This commit is contained in:
commit
40461488db
@ -39,6 +39,8 @@ import org.gradle.api.provider.ProviderFactory;
|
|||||||
import org.gradle.api.tasks.SourceSet;
|
import org.gradle.api.tasks.SourceSet;
|
||||||
import org.gradle.api.tasks.SourceSetContainer;
|
import org.gradle.api.tasks.SourceSetContainer;
|
||||||
import org.gradle.api.tasks.TaskProvider;
|
import org.gradle.api.tasks.TaskProvider;
|
||||||
|
import org.gradle.jvm.toolchain.JavaToolchainService;
|
||||||
|
import org.gradle.jvm.toolchain.JavaToolchainSpec;
|
||||||
|
|
||||||
import org.springframework.boot.gradle.tasks.aot.AbstractAot;
|
import org.springframework.boot.gradle.tasks.aot.AbstractAot;
|
||||||
import org.springframework.boot.gradle.tasks.aot.ProcessAot;
|
import org.springframework.boot.gradle.tasks.aot.ProcessAot;
|
||||||
@ -149,6 +151,13 @@ public class SpringBootAotPlugin implements Plugin<Project> {
|
|||||||
.set(project.getLayout().getBuildDirectory().dir("generated/" + sourceSet.getName() + "Classes"));
|
.set(project.getLayout().getBuildDirectory().dir("generated/" + sourceSet.getName() + "Classes"));
|
||||||
task.getGroupId().set(project.provider(() -> String.valueOf(project.getGroup())));
|
task.getGroupId().set(project.provider(() -> String.valueOf(project.getGroup())));
|
||||||
task.getArtifactId().set(project.provider(() -> project.getName()));
|
task.getArtifactId().set(project.provider(() -> project.getName()));
|
||||||
|
configureToolchainConvention(project, task);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void configureToolchainConvention(Project project, AbstractAot aotTask) {
|
||||||
|
JavaToolchainSpec toolchain = project.getExtensions().getByType(JavaPluginExtension.class).getToolchain();
|
||||||
|
JavaToolchainService toolchainService = project.getExtensions().getByType(JavaToolchainService.class);
|
||||||
|
aotTask.getJavaLauncher().convention(toolchainService.launcherFor(toolchain));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||||
|
Loading…
Reference in New Issue
Block a user