Skip to content

Commit 7cd87ac

Browse files
larsgreferwilkinsona
authored andcommitted
Avoid using Gradle APIs that trigger eager task creation
See gh-29762
1 parent 622e620 commit 7cd87ac

File tree

3 files changed

+35
-30
lines changed

3 files changed

+35
-30
lines changed

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

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.gradle.api.file.FileCollection;
3232
import org.gradle.api.plugins.ApplicationPlugin;
3333
import org.gradle.api.plugins.ApplicationPluginConvention;
34+
import org.gradle.api.tasks.TaskProvider;
3435
import org.gradle.jvm.application.scripts.TemplateBasedScriptGenerator;
3536
import org.gradle.jvm.application.tasks.CreateStartScripts;
3637

@@ -49,26 +50,29 @@ public void execute(Project project) {
4950
Distribution distribution = distributions.create("boot");
5051
distribution.getDistributionBaseName()
5152
.convention((project.provider(() -> applicationConvention.getApplicationName() + "-boot")));
52-
CreateStartScripts bootStartScripts = project.getTasks().create("bootStartScripts", CreateStartScripts.class);
53-
bootStartScripts
54-
.setDescription("Generates OS-specific start scripts to run the project as a Spring Boot application.");
55-
((TemplateBasedScriptGenerator) bootStartScripts.getUnixStartScriptGenerator())
56-
.setTemplate(project.getResources().getText().fromString(loadResource("/unixStartScript.txt")));
57-
((TemplateBasedScriptGenerator) bootStartScripts.getWindowsStartScriptGenerator())
58-
.setTemplate(project.getResources().getText().fromString(loadResource("/windowsStartScript.txt")));
59-
project.getConfigurations().all((configuration) -> {
60-
if ("bootArchives".equals(configuration.getName())) {
61-
CopySpec libCopySpec = project.copySpec().into("lib")
62-
.from((Callable<FileCollection>) () -> configuration.getArtifacts().getFiles());
63-
libCopySpec.setFileMode(0644);
64-
distribution.getContents().with(libCopySpec);
65-
bootStartScripts.setClasspath(configuration.getArtifacts().getFiles());
66-
}
67-
});
68-
bootStartScripts.getConventionMapping().map("outputDir", () -> new File(project.getBuildDir(), "bootScripts"));
69-
bootStartScripts.getConventionMapping().map("applicationName", applicationConvention::getApplicationName);
70-
bootStartScripts.getConventionMapping().map("defaultJvmOpts",
71-
applicationConvention::getApplicationDefaultJvmArgs);
53+
TaskProvider<CreateStartScripts> bootStartScripts = project.getTasks().register("bootStartScripts",
54+
CreateStartScripts.class, (bss) -> {
55+
bss.setDescription(
56+
"Generates OS-specific start scripts to run the project as a Spring Boot application.");
57+
((TemplateBasedScriptGenerator) bss.getUnixStartScriptGenerator()).setTemplate(
58+
project.getResources().getText().fromString(loadResource("/unixStartScript.txt")));
59+
((TemplateBasedScriptGenerator) bss.getWindowsStartScriptGenerator()).setTemplate(
60+
project.getResources().getText().fromString(loadResource("/windowsStartScript.txt")));
61+
62+
project.getConfigurations().all((configuration) -> {
63+
if ("bootArchives".equals(configuration.getName())) {
64+
CopySpec libCopySpec = project.copySpec().into("lib")
65+
.from((Callable<FileCollection>) () -> configuration.getArtifacts().getFiles());
66+
libCopySpec.setFileMode(0644);
67+
distribution.getContents().with(libCopySpec);
68+
bss.setClasspath(configuration.getArtifacts().getFiles());
69+
}
70+
});
71+
bss.getConventionMapping().map("outputDir", () -> new File(project.getBuildDir(), "bootScripts"));
72+
bss.getConventionMapping().map("applicationName", applicationConvention::getApplicationName);
73+
bss.getConventionMapping().map("defaultJvmOpts",
74+
applicationConvention::getApplicationDefaultJvmArgs);
75+
});
7276
CopySpec binCopySpec = project.copySpec().into("bin").from(bootStartScripts);
7377
binCopySpec.setFileMode(0755);
7478
distribution.getContents().with(binCopySpec);

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,16 @@ private JavaPluginConvention javaPluginConvention(Project project) {
167167
}
168168

169169
private void configureUtf8Encoding(Project project) {
170-
project.afterEvaluate((evaluated) -> evaluated.getTasks().withType(JavaCompile.class, (compile) -> {
171-
if (compile.getOptions().getEncoding() == null) {
172-
compile.getOptions().setEncoding("UTF-8");
173-
}
174-
}));
170+
project.afterEvaluate(
171+
(evaluated) -> evaluated.getTasks().withType(JavaCompile.class).configureEach((compile) -> {
172+
if (compile.getOptions().getEncoding() == null) {
173+
compile.getOptions().setEncoding("UTF-8");
174+
}
175+
}));
175176
}
176177

177178
private void configureParametersCompilerArg(Project project) {
178-
project.getTasks().withType(JavaCompile.class, (compile) -> {
179+
project.getTasks().withType(JavaCompile.class).configureEach((compile) -> {
179180
List<String> compilerArgs = compile.getOptions().getCompilerArgs();
180181
if (!compilerArgs.contains(PARAMETERS_COMPILER_ARG)) {
181182
compilerArgs.add(PARAMETERS_COMPILER_ARG);
@@ -184,8 +185,8 @@ private void configureParametersCompilerArg(Project project) {
184185
}
185186

186187
private void configureAdditionalMetadataLocations(Project project) {
187-
project.afterEvaluate((evaluated) -> evaluated.getTasks().withType(JavaCompile.class,
188-
this::configureAdditionalMetadataLocations));
188+
project.afterEvaluate((evaluated) -> evaluated.getTasks().withType(JavaCompile.class)
189+
.configureEach(this::configureAdditionalMetadataLocations));
189190
}
190191

191192
private void configureAdditionalMetadataLocations(JavaCompile compile) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ private String getKotlinVersion(Project project) {
4747
}
4848

4949
private void enableJavaParametersOption(Project project) {
50-
project.getTasks().withType(KotlinCompile.class,
51-
(compile) -> compile.getKotlinOptions().setJavaParameters(true));
50+
project.getTasks().withType(KotlinCompile.class)
51+
.configureEach((compile) -> compile.getKotlinOptions().setJavaParameters(true));
5252
}
5353

5454
@Override

0 commit comments

Comments
 (0)