azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change dsl method to 'jvmToolchain'.

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

^KT-43095 In Progress
This commit is contained in:
Yahor Berdnikau
2021-06-15 15:59:16 +02:00
committed by Space
parent 1a6bb5cd08
commit 1c9b013732
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt
+1 -1
View File
@@ -404,7 +404,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
import org.gradle.jvm.toolchain.JavaToolchainService import org.gradle.jvm.toolchain.JavaToolchainService
kotlin { kotlin {
toolchain { jvmToolchain {
languageVersion.set(JavaLanguageVersion.of($jdkVersion)) languageVersion.set(JavaLanguageVersion.of($jdkVersion))
} }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt
+2 -2
View File
@@ -64,11 +64,11 @@ open class KotlinTopLevelExtension (internal val project: Project) {
private val toolchainSupport = ToolchainSupport.createToolchain(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`. * @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) toolchainSupport.applyToolchain(action)
} }