From 1c9b0137324d10a63d30c209ccc77462b3574196 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Tue, 15 Jun 2021 15:59:16 +0200
Subject: [PATCH] Change dsl method to 'jvmToolchain'.

This better reflects that applying toolchain only affects jvm
backend compilations.

^KT-43095 In Progress
---
 .../org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt    | 2 +-
 .../org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt
index 7a70692e597..8e7f6f864fd 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt
@@ -404,7 +404,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
             import org.gradle.jvm.toolchain.JavaToolchainService
             
             kotlin {
-                toolchain {
+                jvmToolchain {
                     languageVersion.set(JavaLanguageVersion.of($jdkVersion))
                 }
             }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt
index 2b0ec625ca3..1e6890fad17 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt
@@ -64,11 +64,11 @@ open class KotlinTopLevelExtension (internal val project: Project) {
     private val toolchainSupport = ToolchainSupport.createToolchain(project)
 
     /**
-     * Configures [Java toolchain](https://docs.gradle.org/current/userguide/toolchains.html) both for Kotlin and Java tasks.
+     * Configures [Java toolchain](https://docs.gradle.org/current/userguide/toolchains.html) both for Kotlin JVM and Java tasks.
      *
      * @param action - action to configure [JavaToolchainSpec]. You could safely cast `Any` into `JavaToolchainSpec`.
      */
-    fun toolchain(action: Action<Any>) {
+    fun jvmToolchain(action: Action<Any>) {
         toolchainSupport.applyToolchain(action)
     }