From 051cfb7248c7a810a7d84c85c1d0ab3fd5060186 Mon Sep 17 00:00:00 2001
From: Gauthier Roebroeck <gauthier.roebroeck@gmail.com>
Date: Fri, 13 Dec 2024 10:38:04 +0800
Subject: [PATCH] build: move JDK configuration for desktop app to Conveyor
 configuration

---
 .github/workflows/release.yml | 7 -------
 .github/workflows/tests.yml   | 6 ------
 DEVELOPING.md                 | 2 +-
 conveyor.conf                 | 1 +
 komga-tray/build.gradle.kts   | 4 ----
 komga/build.gradle.kts        | 4 ----
 6 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a8e264b2..07d9b972 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -90,13 +90,6 @@ jobs:
           cache: 'npm'
           cache-dependency-path: komga-webui/package-lock.json
 
-      - name: Setup Java 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: 21
-          java-package: 'jdk'
-          distribution: 'temurin'
-
       - name: Setup Java 17
         uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c2910ff9..539ea65c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,12 +16,6 @@ jobs:
     name: Test server
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Java 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: 21
-          java-package: 'jdk'
-          distribution: 'temurin'
       - name: Setup Java 17
         uses: actions/setup-java@v4
         with:
diff --git a/DEVELOPING.md b/DEVELOPING.md
index 7eaacaf3..198a6757 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -6,7 +6,7 @@ Thanks a lot for contributing to Komga!
 
 You will need:
 
-- Java JDK version 17 & 21
+- Java JDK version 17+
 - Nodejs version 18+ (check the `.nvmrc` file)
 
 ## Setting up the project
diff --git a/conveyor.conf b/conveyor.conf
index 815c26c2..be549caa 100644
--- a/conveyor.conf
+++ b/conveyor.conf
@@ -1,4 +1,5 @@
 include "#!./gradlew -q :komga-tray:printConveyorConfig"
+include required("/stdlib/jdk/21/eclipse.conf")
 
 app {
     display-name = Komga
diff --git a/komga-tray/build.gradle.kts b/komga-tray/build.gradle.kts
index 8e3558c8..96986cb0 100644
--- a/komga-tray/build.gradle.kts
+++ b/komga-tray/build.gradle.kts
@@ -13,10 +13,6 @@ plugins {
 
 group = "org.gotson"
 
-kotlin {
-  jvmToolchain(21)
-}
-
 tasks {
   withType<JavaCompile> {
     sourceCompatibility = "17"
diff --git a/komga/build.gradle.kts b/komga/build.gradle.kts
index eecf85b5..1270dd5e 100644
--- a/komga/build.gradle.kts
+++ b/komga/build.gradle.kts
@@ -19,10 +19,6 @@ plugins {
   jacoco
 }
 
-kotlin {
-  jvmToolchain(17)
-}
-
 val benchmarkSourceSet =
   sourceSets.create("benchmark") {
     java {