root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish "Test Gradle plugin against Gradle 8.2-rc-1" 

See gh-35708
This commit is contained in:
Andy Wilkinson 2023-06-02 15:35:34 +01:00
parent d6192a0fa1
commit 45ce18e1c7
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java
View File

@ -32,6 +32,7 @@ import org.gradle.api.file.CopySpec;
import org.gradle.api.file.FileCollection; import org.gradle.api.file.FileCollection;
import org.gradle.api.plugins.ApplicationPlugin; import org.gradle.api.plugins.ApplicationPlugin;
import org.gradle.api.plugins.JavaApplication; import org.gradle.api.plugins.JavaApplication;
import org.gradle.api.tasks.TaskContainer;
import org.gradle.api.tasks.TaskProvider; import org.gradle.api.tasks.TaskProvider;
import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator; import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator;
import org.gradle.jvm.application.tasks.CreateStartScripts; import org.gradle.jvm.application.tasks.CreateStartScripts;
@ -58,8 +59,17 @@ final class ApplicationPluginAction implements PluginApplicationAction {
CopySpec binCopySpec = project.copySpec().into("bin").from(bootStartScripts); CopySpec binCopySpec = project.copySpec().into("bin").from(bootStartScripts);
binCopySpec.setFileMode(0755); binCopySpec.setFileMode(0755);
distribution.getContents().with(binCopySpec); distribution.getContents().with(binCopySpec);
project.getTasks() applyApplicationDefaultJvmArgsToRunTasks(project.getTasks(), javaApplication);
.named(SpringBootPlugin.BOOT_RUN_TASK_NAME, BootRun.class) }
private void applyApplicationDefaultJvmArgsToRunTasks(TaskContainer tasks, JavaApplication javaApplication) {
applyApplicationDefaultJvmArgsToRunTask(tasks, javaApplication, SpringBootPlugin.BOOT_RUN_TASK_NAME);
applyApplicationDefaultJvmArgsToRunTask(tasks, javaApplication, SpringBootPlugin.BOOT_TEST_RUN_TASK_NAME);
}
private void applyApplicationDefaultJvmArgsToRunTask(TaskContainer tasks, JavaApplication javaApplication,
String taskName) {
tasks.named(taskName, BootRun.class)
.configure((bootRun) -> bootRun.getConventionMapping() .configure((bootRun) -> bootRun.getConventionMapping()
.map("jvmArgs", javaApplication::getApplicationDefaultJvmArgs)); .map("jvmArgs", javaApplication::getApplicationDefaultJvmArgs));
} }

6
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java
View File

@ -218,12 +218,6 @@ final class JavaPluginAction implements PluginApplicationAction {
run.setDescription("Runs this project as a Spring Boot application using the test runtime classpath."); run.setDescription("Runs this project as a Spring Boot application using the test runtime classpath.");
run.setGroup(ApplicationPlugin.APPLICATION_GROUP); run.setGroup(ApplicationPlugin.APPLICATION_GROUP);
run.classpath(classpath); run.classpath(classpath);
run.getConventionMapping().map("jvmArgs", () -> {
if (project.hasProperty("applicationDefaultJvmArgs")) {
return project.property("applicationDefaultJvmArgs");
}
return Collections.emptyList();
});
run.getMainClass().convention(resolveMainClassName.flatMap(ResolveMainClassName::readMainClassName)); run.getMainClass().convention(resolveMainClassName.flatMap(ResolveMainClassName::readMainClassName));
configureToolchainConvention(project, run); configureToolchainConvention(project, run);
}); });

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
View File

@ -72,6 +72,8 @@ public class SpringBootPlugin implements Plugin<Project> {
static final String BOOT_RUN_TASK_NAME = "bootRun"; static final String BOOT_RUN_TASK_NAME = "bootRun";
static final String BOOT_TEST_RUN_TASK_NAME = "bootTestRun";
/** /**
* The name of the {@code developmentOnly} configuration. * The name of the {@code developmentOnly} configuration.
* @since 2.3.0 * @since 2.3.0