From 076125282ddb4ace020a1800d13877707cbf1945 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 22 Sep 2022 13:51:11 +0200
Subject: [PATCH] Define default build JVM toolchain

---
 buildSrc/src/main/kotlin/JvmToolchain.kt | 4 +++-
 buildSrc/src/main/kotlin/dependencies.kt | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/JvmToolchain.kt b/buildSrc/src/main/kotlin/JvmToolchain.kt
index 2e1a07abce9..884ed87d249 100644
--- a/buildSrc/src/main/kotlin/JvmToolchain.kt
+++ b/buildSrc/src/main/kotlin/JvmToolchain.kt
@@ -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(
diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
index 0224e12d23d..aed5a08f849 100644
--- a/buildSrc/src/main/kotlin/dependencies.kt
+++ b/buildSrc/src/main/kotlin/dependencies.kt
@@ -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!")
         }