From a31bdc6454b44680ff3ff80151da87137de12726 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <simon.ogorodnik@jetbrains.com>
Date: Tue, 6 Jul 2021 15:30:22 +0300
Subject: [PATCH] [Build] Respect overrides in getToolchainLauncherFor

---
 buildSrc/src/main/kotlin/JvmToolchain.kt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/JvmToolchain.kt b/buildSrc/src/main/kotlin/JvmToolchain.kt
index b5a4c4130f2..f5acf9ab2ce 100644
--- a/buildSrc/src/main/kotlin/JvmToolchain.kt
+++ b/buildSrc/src/main/kotlin/JvmToolchain.kt
@@ -164,7 +164,17 @@ fun Project.getToolchainLauncherFor(
     jdkVersion: JdkMajorVersion
 ): Provider<JavaLauncher> {
     val service = project.extensions.getByType<JavaToolchainService>()
+    val jdkVersionWithOverride = project.getJdkVersionWithOverride(jdkVersion)
     return service.launcherFor {
-        this.languageVersion.set(JavaLanguageVersion.of(jdkVersion.majorVersion))
+        this.languageVersion.set(JavaLanguageVersion.of(jdkVersionWithOverride.majorVersion))
     }
 }
+
+
+fun Project.getJdkVersionWithOverride(jdkVersion: JdkMajorVersion): JdkMajorVersion {
+    return if (project.shouldOverrideObsoleteJdk(jdkVersion)) {
+        JdkMajorVersion.fromMajorVersion(jdkVersion.overrideMajorVersion!!)
+    } else {
+        jdkVersion
+    }
+}
\ No newline at end of file