From e106badec7002704311657ceb9d5eaaacaa10cff Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Thu, 26 Mar 2026 12:25:05 -0500
Subject: [PATCH] build: update JVM toolchain and CI Java distribution (#4936)

---
 .github/workflows/release.yml | 6 +++---
 desktop/build.gradle.kts      | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5087ba9d5..ed6cf0c7f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -119,7 +119,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           java-version: '17'
-          distribution: 'jetbrains'
+          distribution: 'temurin'
           token: ${{ github.token }}
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
@@ -211,7 +211,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           java-version: '17'
-          distribution: 'jetbrains'
+          distribution: 'temurin'
           token: ${{ github.token }}
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
@@ -283,7 +283,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           java-version: '17'
-          distribution: 'jetbrains'
+          distribution: 'temurin'
           token: ${{ github.token }}
 
       - name: Setup Gradle
diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
index 618d67aeb..c535b4696 100644
--- a/desktop/build.gradle.kts
+++ b/desktop/build.gradle.kts
@@ -33,7 +33,10 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.JETBRAINS)
+    }
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_17)
         freeCompilerArgs.add("-Xjvm-default=all")