Skip to content

Commit 8f44bd8

Browse files
committed
Polish "Allow Gradle tasks to be executed with a custom Java home"
See gh-20179
1 parent e599ed0 commit 8f44bd8

File tree

2 files changed

+23
-18
lines changed

2 files changed

+23
-18
lines changed

buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.List;
2727
import java.util.Map;
2828
import java.util.TreeMap;
29+
import java.util.function.Consumer;
2930

3031
import io.spring.javaformat.gradle.FormatTask;
3132
import io.spring.javaformat.gradle.SpringJavaFormatPlugin;
@@ -127,27 +128,22 @@ private void applyJavaConventions(Project project) {
127128
project.setProperty("sourceCompatibility", "1.8");
128129
project.getTasks().withType(JavaCompile.class, (compile) -> {
129130
compile.getOptions().setEncoding("UTF-8");
130-
if (hasCustomBuildJavaHome(project)) {
131-
String javaExecutable = getCustomBuildJavaExecutable(project, "/bin/java");
132-
compile.getOptions().getForkOptions().setJavaHome(new File(javaExecutable));
133-
}
131+
withOptionalBuildJavaHome(project, (javaHome) -> {
132+
compile.getOptions().setFork(true);
133+
compile.getOptions().getForkOptions().setJavaHome(new File(javaHome));
134+
compile.getOptions().getForkOptions().setExecutable(javaHome + "/bin/javac");
135+
});
134136
List<String> args = compile.getOptions().getCompilerArgs();
135137
if (!args.contains("-parameters")) {
136138
args.add("-parameters");
137139
}
138140
});
139141
project.getTasks().withType(Javadoc.class, (javadoc) -> {
140142
javadoc.getOptions().source("1.8").encoding("UTF-8");
141-
if (hasCustomBuildJavaHome(project)) {
142-
String javaExecutable = getCustomBuildJavaExecutable(project, "/bin/javadoc");
143-
javadoc.setExecutable(javaExecutable);
144-
}
143+
withOptionalBuildJavaHome(project, (javaHome) -> javadoc.setExecutable(javaHome + "/bin/javadoc"));
145144
});
146145
project.getTasks().withType(Test.class, (test) -> {
147-
if (hasCustomBuildJavaHome(project)) {
148-
String javaExecutable = getCustomBuildJavaExecutable(project, "/bin/java");
149-
test.setExecutable(javaExecutable);
150-
}
146+
withOptionalBuildJavaHome(project, (javaHome) -> test.setExecutable(javaHome + "/bin/java"));
151147
test.useJUnitPlatform();
152148
test.setMaxHeapSize("1024M");
153149
});
@@ -205,12 +201,11 @@ private File createLegalFile(File source, String filename) {
205201
return legalFile;
206202
}
207203

208-
private boolean hasCustomBuildJavaHome(Project project) {
209-
return project.hasProperty("buildJavaHome") && !((String) project.property("buildJavaHome")).isEmpty();
210-
}
211-
212-
private String getCustomBuildJavaExecutable(Project project, String executable) {
213-
return project.property("buildJavaHome") + executable;
204+
private void withOptionalBuildJavaHome(Project project, Consumer<String> consumer) {
205+
String buildJavaHome = (String) project.findProperty("buildJavaHome");
206+
if (buildJavaHome != null && !buildJavaHome.isEmpty()) {
207+
consumer.accept(buildJavaHome);
208+
}
214209
}
215210

216211
private void configureSpringJavaFormat(Project project) {

settings.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@ plugins {
2828

2929
rootProject.name="spring-boot-build"
3030

31+
settings.gradle.projectsLoaded {
32+
gradleEnterprise {
33+
buildScan {
34+
if (settings.gradle.rootProject.hasProperty('buildJavaHome')) {
35+
value('Build Java home', settings.gradle.rootProject.getProperty('buildJavaHome'))
36+
}
37+
}
38+
}
39+
}
40+
3141
include "spring-boot-project:spring-boot-dependencies"
3242
include "spring-boot-project:spring-boot-parent"
3343
include "spring-boot-project:spring-boot-tools:spring-boot-antlib"

0 commit comments

Comments
 (0)