From c3a3e997249cc07b5c40bd6e18362aa5051c44b9 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Mon, 5 Jul 2021 23:15:44 +0200
Subject: [PATCH] Fix toolchain is not applied for modules with 'java' plugin.

Use common base java plugin for configuration action: 'java-base'.

^KT-46972 Fixed
---
 buildSrc/src/main/kotlin/JvmToolchain.kt | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/buildSrc/src/main/kotlin/JvmToolchain.kt b/buildSrc/src/main/kotlin/JvmToolchain.kt
index ebf818dfa3c..b5a4c4130f2 100644
--- a/buildSrc/src/main/kotlin/JvmToolchain.kt
+++ b/buildSrc/src/main/kotlin/JvmToolchain.kt
@@ -77,20 +77,24 @@ fun Project.configureJvmToolchain(
 fun Project.configureJavaOnlyToolchain(
     jdkVersion: JdkMajorVersion
 ) {
-    plugins.withId("java-library") {
+    plugins.withId("java-base") {
         val javaExtension = extensions.getByType<JavaPluginExtension>()
         if (shouldOverrideObsoleteJdk(jdkVersion)) {
-            javaExtension.toolchain.languageVersion.set(
-                JavaLanguageVersion.of(jdkVersion.overrideMajorVersion!!)
-            )
+            javaExtension.toolchain {
+                languageVersion.set(
+                    JavaLanguageVersion.of(jdkVersion.overrideMajorVersion!!)
+                )
+            }
             tasks.withType<JavaCompile>().configureEach {
                 targetCompatibility = jdkVersion.targetName
                 sourceCompatibility = jdkVersion.targetName
             }
         } else {
-            javaExtension.toolchain.languageVersion.set(
-                JavaLanguageVersion.of(jdkVersion.majorVersion)
-            )
+            javaExtension.toolchain {
+                languageVersion.set(
+                    JavaLanguageVersion.of(jdkVersion.majorVersion)
+                )
+            }
         }
     }
 }