build: move JDK configuration for desktop app to Conveyor configuration

This commit is contained in:
Gauthier Roebroeck 2024-12-13 10:38:04 +08:00
parent 225f58f81c
commit 051cfb7248
6 changed files with 2 additions and 22 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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

View File

@ -1,4 +1,5 @@
include "#!./gradlew -q :komga-tray:printConveyorConfig"
include required("/stdlib/jdk/21/eclipse.conf")
app {
display-name = Komga

View File

@ -13,10 +13,6 @@ plugins {
group = "org.gotson"
kotlin {
jvmToolchain(21)
}
tasks {
withType<JavaCompile> {
sourceCompatibility = "17"

View File

@ -19,10 +19,6 @@ plugins {
jacoco
}
kotlin {
jvmToolchain(17)
}
val benchmarkSourceSet =
sourceSets.create("benchmark") {
java {