@@ -137,7 +137,6 @@ abstract class GraalVMDownloadTask extends DefaultTask {
137137 GraalVMJDK getConfiguredGraalVMJDK () {
138138 if (graalVMJDK. isPresent()) {
139139 final value = graalVMJDK. get()
140- logger. info(" graalVMJDK is set as task property, value='${ value} '" )
141140 if (value == null ) {
142141 throw new GradleException (" Property 'graalVMJDK' in task '${ this.name} ' must not be null" )
143142 } else if (value instanceof GraalVMJDK ) {
@@ -151,18 +150,14 @@ abstract class GraalVMDownloadTask extends DefaultTask {
151150 return jdk
152151 }
153152 }
154- logger. info(" graalVMJDK is not set as task property" )
155153 if (providers. gradleProperty(PROP_JDK ). isPresent()) {
156154 final value = providers. gradleProperty(PROP_JDK ). get()
157- logger. info(" Project has property ${ PROP_JDK} , value is '${ value} '" )
158155 final jdk = GraalVMJDK . fromString(value. trim())
159156 if (jdk == null ) {
160157 throw new GradleException (" Illegal value for project property '$PROP_JDK '. Got value '$value '" )
161158 }
162- logger. info(" Converted JDK is '${ jdk} '" )
163159 return jdk
164160 }
165- logger. info(" Project doesn't have property ${ PROP_JDK} . Using default value '${ DEFAULT_GRAALVM_JDK} '" )
166161 return DEFAULT_GRAALVM_JDK
167162 }
168163
@@ -201,7 +196,7 @@ abstract class GraalVMDownloadTask extends DefaultTask {
201196 }
202197
203198 File buildInstallationBaseDir () {
204- return new File (project. projectDir , " software" )
199+ return new File (project. layout . projectDirectory . asFile , " software" )
205200 }
206201
207202 def createInstallationBaseDir () {
@@ -253,7 +248,7 @@ abstract class GraalVMDownloadTask extends DefaultTask {
253248 // add JS language to the GraalVM, but only for GraalVM for JDK17. Newer GraalVM versions
254249 // available for JDK21 already include the js engine and don't provide the 'gu' tool
255250 if (configuredGraalVMJDK == GraalVMJDK . JDK17 ) {
256- logger. info(" Installation JS language in GraalVM for JDK '$jdk ' in directory '$installDir '" )
251+ logger. info(" Installing JS language in GraalVM for JDK '$jdk ' in directory '$installDir '" )
257252 final binDir = new File (installDir, " bin" )
258253 final guCommand = configuredGraalVMPlatform. isWindows()
259254 ? new File (binDir, " gu.cmd" )
0 commit comments