diff --git a/build-logic/tools/build.gradle.kts b/build-logic/tools/build.gradle.kts index d9893413b4..039e72122e 100644 --- a/build-logic/tools/build.gradle.kts +++ b/build-logic/tools/build.gradle.kts @@ -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 { diff --git a/core-util-jvm/build.gradle.kts b/core-util-jvm/build.gradle.kts index baa9844230..f4711d14dd 100644 --- a/core-util-jvm/build.gradle.kts +++ b/core-util-jvm/build.gradle.kts @@ -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)