Add function to get toolchain JDK home location

Junnyjun · Apr 27, 2023 · e7989ee · e7989ee
1 parent 08c22c3
commit e7989ee
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/buildSrc/src/main/kotlin/JvmToolchain.kt b/buildSrc/src/main/kotlin/JvmToolchain.kt
@@ -1,4 +1,5 @@
 @file:JvmName("JvmToolchain")
+
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.provider.Provider
@@ -195,6 +196,12 @@ fun Project.getToolchainLauncherFor(
     }
 }
 
+fun Project.getToolchainJdkHomeFor(jdkVersion: JdkMajorVersion): Provider<String> {
+    return getToolchainLauncherFor(jdkVersion).map {
+        it.metadata.installationPath.asFile.absolutePath
+    }
+}
+
 
 fun Project.getJdkVersionWithOverride(jdkVersion: JdkMajorVersion): JdkMajorVersion {
     return if (project.shouldOverrideObsoleteJdk(jdkVersion)) {

diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt
@@ -258,8 +258,8 @@ fun Project.projectTest(
         }
 
         defineJDKEnvVariables.forEach { version ->
-            val javaLauncher = project.getToolchainLauncherFor(version).orNull ?: error("Can't find toolchain for $version")
-            environment(version.envName, javaLauncher.metadata.installationPath.asFile.absolutePath)
+            val jdkHome = project.getToolchainJdkHomeFor(version).orNull ?: error("Can't find toolchain for $version")
+            environment(version.envName, jdkHome)
         }
     }.apply { configure(body) }
 }

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -347,12 +347,12 @@ tasks.withType<Test> {
         systemProperty("installCocoapods", installCocoapods)
     }
 
-    val jdk8Provider = project.getToolchainLauncherFor(JdkMajorVersion.JDK_1_8).map { it.metadata.installationPath.asFile.absolutePath }
-    val jdk9Provider = project.getToolchainLauncherFor(JdkMajorVersion.JDK_9_0).map { it.metadata.installationPath.asFile.absolutePath }
-    val jdk10Provider = project.getToolchainLauncherFor(JdkMajorVersion.JDK_10_0).map { it.metadata.installationPath.asFile.absolutePath }
-    val jdk11Provider = project.getToolchainLauncherFor(JdkMajorVersion.JDK_11_0).map { it.metadata.installationPath.asFile.absolutePath }
-    val jdk16Provider = project.getToolchainLauncherFor(JdkMajorVersion.JDK_16_0).map { it.metadata.installationPath.asFile.absolutePath }
-    val jdk17Provider = project.getToolchainLauncherFor(JdkMajorVersion.JDK_17_0).map { it.metadata.installationPath.asFile.absolutePath }
+    val jdk8Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_1_8)
+    val jdk9Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_9_0)
+    val jdk10Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_10_0)
+    val jdk11Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_11_0)
+    val jdk16Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_16_0)
+    val jdk17Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_17_0)
     val mavenLocalRepo = project.providers.systemProperty("maven.repo.local").forUseAtConfigurationTime().orNull
 
     // Query required JDKs paths only on execution phase to avoid triggering auto-download on project configuration phase