Set kotlin jvmToolchain for jvm modules.

Closes #13686

Fixes #13523
This commit is contained in:
ᡠᠵᡠᡳ ᡠᠵᡠ ᠮᠠᠨᡩ᠋ᠠᠨ 2024-09-12 20:04:17 +00:00 committed by Greyson Parrelli
parent 81b4339bea
commit 789aea3a3a
2 changed files with 14 additions and 0 deletions

View file

@ -5,12 +5,19 @@ plugins {
}
val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
java {
sourceCompatibility = signalJavaVersion
targetCompatibility = signalJavaVersion
}
kotlin {
jvmToolchain {
languageVersion = JavaLanguageVersion.of(signalKotlinJvmTarget)
}
}
// NOTE: For now, in order to run ktlint on this project, you have to manually run ./gradlew :build-logic:tools:ktlintFormat
// Gotta figure out how to get it auto-included in the normal ./gradlew ktlintFormat
ktlint {

View file

@ -4,6 +4,7 @@
*/
val signalJavaVersion: JavaVersion by rootProject.extra
val signalKotlinJvmTarget: String by rootProject.extra
plugins {
id("java-library")
@ -16,6 +17,12 @@ java {
targetCompatibility = signalJavaVersion
}
kotlin {
jvmToolchain {
languageVersion = JavaLanguageVersion.of(signalKotlinJvmTarget)
}
}
dependencies {
implementation(libs.kotlin.reflect)