From 789aea3a3a53cb15e2e025921facb335bfc47122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=A1=A0=E1=A0=B5=E1=A1=A0=E1=A1=B3=20=E1=A1=A0=E1=A0=B5?=
 =?UTF-8?q?=E1=A1=A0=20=E1=A0=AE=E1=A0=A0=E1=A0=A8=E1=A1=A9=E1=A0=8B?=
 =?UTF-8?q?=E1=A0=A0=E1=A0=A8?=
 <125150101+UjuiUjuMandan@users.noreply.github.com>
Date: Thu, 12 Sep 2024 20:04:17 +0000
Subject: [PATCH] Set kotlin jvmToolchain for jvm modules.

Closes #13686

Fixes #13523
---
 build-logic/tools/build.gradle.kts | 7 +++++++
 core-util-jvm/build.gradle.kts     | 7 +++++++
 2 files changed, 14 insertions(+)

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)