Skip to content

Commit f49f19d

Browse files
committed
Lazy evaluate java9home (#33301)
1 parent cd378d5 commit f49f19d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class BuildPlugin implements Plugin<Project> {
211211
project.rootProject.ext.minimumRuntimeVersion = minimumRuntimeVersion
212212
project.rootProject.ext.inFipsJvm = inFipsJvm
213213
project.rootProject.ext.gradleJavaVersion = JavaVersion.toVersion(gradleJavaVersion)
214-
project.rootProject.ext.java9Home = findJavaHome("9")
214+
project.rootProject.ext.java9Home = "${-> findJavaHome("9")}"
215215
}
216216

217217
project.targetCompatibility = project.rootProject.ext.minimumRuntimeVersion

buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ForbiddenApisCliTask.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ public class ForbiddenApisCliTask extends DefaultTask {
5151
private JavaVersion targetCompatibility;
5252
private FileCollection classesDirs;
5353
private SourceSet sourceSet;
54-
private String javaHome;
54+
// This needs to be an object so it can hold Groovy GStrings
55+
private Object javaHome;
5556

5657
@Input
5758
public JavaVersion getTargetCompatibility() {
@@ -142,11 +143,11 @@ public Configuration getForbiddenAPIsConfiguration() {
142143
}
143144

144145
@Input
145-
public String getJavaHome() {
146+
public Object getJavaHome() {
146147
return javaHome;
147148
}
148149

149-
public void setJavaHome(String javaHome) {
150+
public void setJavaHome(Object javaHome) {
150151
this.javaHome = javaHome;
151152
}
152153

0 commit comments

Comments
 (0)