Define default build JVM toolchain

This commit is contained in:
Nikolay Krasko
2022-09-22 13:51:11 +02:00
committed by Space
parent 13a68b0e2d
commit 076125282d
2 changed files with 4 additions and 2 deletions
+3 -1
View File
@@ -33,8 +33,10 @@ enum class JdkMajorVersion(
}
}
val DEFAULT_JVM_TOOLCHAIN = JdkMajorVersion.JDK_1_8
fun Project.configureJvmDefaultToolchain() {
configureJvmToolchain(JdkMajorVersion.JDK_1_8)
configureJvmToolchain(DEFAULT_JVM_TOOLCHAIN)
}
fun Project.shouldOverrideObsoleteJdk(
+1 -1
View File
@@ -295,7 +295,7 @@ fun Project.toolsJarApi(): Any =
dependencies.project(":dependencies:tools-jar-api")
fun Project.toolsJar(): FileCollection = files(
getToolchainLauncherFor(JdkMajorVersion.JDK_1_8)
getToolchainLauncherFor(DEFAULT_JVM_TOOLCHAIN)
.map {
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar ?: throw GradleException("tools.jar not found!")
}