root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Configure Gradle JVM toolchain for Kotlin tasks

This commit is contained in:
Brian Clozel 2022-02-14 11:47:16 +01:00
parent 2a0ec0b2dd
commit 303e363adf
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gradle/toolchains.gradle
View File

@ -98,22 +98,22 @@ pluginManager.withPlugin("kotlin") {
// Configure the Kotlin compiler if the 'mainToolchain' property is defined
if (mainToolchainConfigured()) {
def mainLanguageVersion = mainToolchainLanguageVersion()
def compiler = javaToolchains.compilerFor {
languageVersion = mainLanguageVersion
}
// See https://kotlinlang.org/docs/gradle.html#attributes-specific-for-jvm
def javaVersion = mainLanguageVersion.toString()
kotlin {
jvmToolchain {
languageVersion.set(mainLanguageVersion)
}
}
compileKotlin {
kotlinOptions {
jvmTarget = javaVersion
jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
}
}
// Compile the test classes with the same version, 'testToolchain' will override if defined
compileTestKotlin {
kotlinOptions {
jvmTarget = javaVersion
jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
}
}
}
@ -136,11 +136,15 @@ pluginManager.withPlugin("kotlin") {
def compiler = javaToolchains.compilerFor {
languageVersion = testLanguageVersion
}
kotlin {
jvmToolchain {
languageVersion.set(testLanguageVersion)
}
}
// See https://kotlinlang.org/docs/gradle.html#attributes-specific-for-jvm
compileTestKotlin {
kotlinOptions {
jvmTarget = testLanguageVersion.toString()
jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
}
}
}