Browse Source

Lazy evaluate java9home (#33301)

Alpar Torok 7 years ago
parent
commit
a84a20844b

+ 1 - 1
buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

@@ -211,7 +211,7 @@ class BuildPlugin implements Plugin<Project> {
             project.rootProject.ext.minimumRuntimeVersion = minimumRuntimeVersion
             project.rootProject.ext.minimumRuntimeVersion = minimumRuntimeVersion
             project.rootProject.ext.inFipsJvm = inFipsJvm
             project.rootProject.ext.inFipsJvm = inFipsJvm
             project.rootProject.ext.gradleJavaVersion = JavaVersion.toVersion(gradleJavaVersion)
             project.rootProject.ext.gradleJavaVersion = JavaVersion.toVersion(gradleJavaVersion)
-            project.rootProject.ext.java9Home = findJavaHome("9")
+            project.rootProject.ext.java9Home = "${-> findJavaHome("9")}"
         }
         }
 
 
         project.targetCompatibility = project.rootProject.ext.minimumRuntimeVersion
         project.targetCompatibility = project.rootProject.ext.minimumRuntimeVersion

+ 4 - 3
buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ForbiddenApisCliTask.java

@@ -51,7 +51,8 @@ public class ForbiddenApisCliTask extends DefaultTask {
     private JavaVersion targetCompatibility;
     private JavaVersion targetCompatibility;
     private FileCollection classesDirs;
     private FileCollection classesDirs;
     private SourceSet sourceSet;
     private SourceSet sourceSet;
-    private String javaHome;
+    // This needs to be an object so it can hold Groovy GStrings
+    private Object javaHome;
 
 
     @Input
     @Input
     public JavaVersion getTargetCompatibility() {
     public JavaVersion getTargetCompatibility() {
@@ -142,11 +143,11 @@ public class ForbiddenApisCliTask extends DefaultTask {
     }
     }
 
 
     @Input
     @Input
-    public String getJavaHome() {
+    public Object getJavaHome() {
         return javaHome;
         return javaHome;
     }
     }
 
 
-    public void setJavaHome(String javaHome) {
+    public void setJavaHome(Object javaHome) {
         this.javaHome = javaHome;
         this.javaHome = javaHome;
     }
     }