From 0b10f255d73673da17e44f050a892499f9b01317 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Fri, 21 May 2021 17:03:35 +0200
Subject: [PATCH] Update 'kotlinOptions.jdkHome' deprecation message.

Also mention java toolchains approach.

^KT-43095 Fixed
---
 .../gradle/internal/CompilerArgumentsContributor.kt | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt
index 898a60a0ca9..d233ddf35d0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt
@@ -116,12 +116,19 @@ internal open class KotlinJvmCompilerArgumentsContributor(
                     """
                     'kotlinOptions.jdkHome' is deprecated and will ignored in Kotlin 1.6! 
                     
-                    Consider using KotlinJavaToolchain:
+                    Consider using JavaToolchain on Gradle 6.7+:
+                    kotlin {
+                        toolchain {
+                            languageVersion.set(JavaLanguageVersion.of(<MAJOR_JDK_VERSION>))
+                        }
+                    }
+                    
+                    Or on older versions of Gradle:
                     - Kotlin DSL:
                     project.tasks
                         .withType<UsesKotlinJavaToolchain>()
                         .configureEach {
-                            it.kotlinJavaToolchain.setJdkHome(
+                            it.kotlinJavaToolchain.jdk.use(
                                 "/path/to/your/jdk",
                                 JavaVersion.<JDK_VERSION>
                             )
@@ -130,7 +137,7 @@ internal open class KotlinJvmCompilerArgumentsContributor(
                     project.tasks
                         .withType(UsesKotlinJavaToolchain.class)
                         .configureEach {
-                             it.kotlinJavaToolchain.setJdkHome(
+                             it.kotlinJavaToolchain.jdk.use(
                                  '/path/to/your/jdk',
                                  JavaVersion.<JDK_VERSION>
                              )