@@ -2,6 +2,7 @@ import com.gradle.develocity.agent.gradle.internal.test.TestDistributionConfigur
2
2
import junitbuild.extensions.capitalized
3
3
import junitbuild.extensions.dependencyProject
4
4
import org.gradle.api.tasks.PathSensitivity.RELATIVE
5
+ import org.gradle.jvm.toolchain.JvmVendorSpec.GRAAL_VM
5
6
import org.gradle.kotlin.dsl.support.listFilesOrdered
6
7
import java.time.Duration
7
8
@@ -227,7 +228,7 @@ val test by testing.suites.getting(JvmTestSuite::class) {
227
228
228
229
val gradleJavaVersion = 21
229
230
jvmArgumentProviders + = JavaHomeDir (project, gradleJavaVersion, develocity.testDistribution.enabled)
230
- jvmArgumentProviders + = JavaHomeDir (project, gradleJavaVersion, develocity.testDistribution.enabled, nativeImage = true )
231
+ jvmArgumentProviders + = JavaHomeDir (project, gradleJavaVersion, develocity.testDistribution.enabled, graalvm = true )
231
232
systemProperty(" gradle.java.version" , gradleJavaVersion)
232
233
}
233
234
}
@@ -254,15 +255,18 @@ class MavenRepo(project: Project, @get:Internal val repoDir: Provider<File>) : C
254
255
override fun asArguments () = listOf (" -Dmaven.repo=${repoDir.get().absolutePath} " )
255
256
}
256
257
257
- class JavaHomeDir (project : Project , @Input val version : Int , testDistributionEnabled : Provider <Boolean >, @Input val nativeImage : Boolean = false ) : CommandLineArgumentProvider {
258
+ class JavaHomeDir (project : Project , @Input val version : Int , testDistributionEnabled : Provider <Boolean >, @Input val graalvm : Boolean = false ) : CommandLineArgumentProvider {
258
259
259
260
@Internal
260
261
val javaLauncher: Property <JavaLauncher > = project.objects.property<JavaLauncher >()
261
262
.value(project.provider {
262
263
try {
263
264
project.javaToolchains.launcherFor {
264
265
languageVersion = JavaLanguageVersion .of(version)
265
- nativeImageCapable = nativeImage
266
+ if (graalvm) {
267
+ vendor = GRAAL_VM
268
+ nativeImageCapable = true
269
+ }
266
270
}.get()
267
271
} catch (e: Exception ) {
268
272
null
@@ -278,7 +282,7 @@ class JavaHomeDir(project: Project, @Input val version: Int, testDistributionEna
278
282
}
279
283
val metadata = javaLauncher.map { it.metadata }
280
284
val javaHome = metadata.map { it.installationPath.asFile.absolutePath }.orNull
281
- return javaHome?.let { listOf (" -Djava.home.$version${if (nativeImage ) " .nativeImage" else " " } =$it " ) } ? : emptyList()
285
+ return javaHome?.let { listOf (" -Djava.home.$version${if (graalvm ) " .nativeImage" else " " } =$it " ) } ? : emptyList()
282
286
}
283
287
}
284
288
0 commit comments