mirror of
https://github.com/gotson/komga.git
synced 2025-01-07 03:07:16 +08:00
build: move JDK configuration for desktop app to Conveyor configuration
This commit is contained in:
parent
225f58f81c
commit
051cfb7248
7
.github/workflows/release.yml
vendored
7
.github/workflows/release.yml
vendored
@ -90,13 +90,6 @@ jobs:
|
|||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
cache-dependency-path: komga-webui/package-lock.json
|
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
|
- name: Setup Java 17
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
6
.github/workflows/tests.yml
vendored
6
.github/workflows/tests.yml
vendored
@ -16,12 +16,6 @@ jobs:
|
|||||||
name: Test server
|
name: Test server
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- 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
|
- name: Setup Java 17
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
@ -6,7 +6,7 @@ Thanks a lot for contributing to Komga!
|
|||||||
|
|
||||||
You will need:
|
You will need:
|
||||||
|
|
||||||
- Java JDK version 17 & 21
|
- Java JDK version 17+
|
||||||
- Nodejs version 18+ (check the `.nvmrc` file)
|
- Nodejs version 18+ (check the `.nvmrc` file)
|
||||||
|
|
||||||
## Setting up the project
|
## Setting up the project
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
include "#!./gradlew -q :komga-tray:printConveyorConfig"
|
include "#!./gradlew -q :komga-tray:printConveyorConfig"
|
||||||
|
include required("/stdlib/jdk/21/eclipse.conf")
|
||||||
|
|
||||||
app {
|
app {
|
||||||
display-name = Komga
|
display-name = Komga
|
||||||
|
@ -13,10 +13,6 @@ plugins {
|
|||||||
|
|
||||||
group = "org.gotson"
|
group = "org.gotson"
|
||||||
|
|
||||||
kotlin {
|
|
||||||
jvmToolchain(21)
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
withType<JavaCompile> {
|
withType<JavaCompile> {
|
||||||
sourceCompatibility = "17"
|
sourceCompatibility = "17"
|
||||||
|
@ -19,10 +19,6 @@ plugins {
|
|||||||
jacoco
|
jacoco
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
|
||||||
jvmToolchain(17)
|
|
||||||
}
|
|
||||||
|
|
||||||
val benchmarkSourceSet =
|
val benchmarkSourceSet =
|
||||||
sourceSets.create("benchmark") {
|
sourceSets.create("benchmark") {
|
||||||
java {
|
java {
|
||||||
|
Loading…
Reference in New Issue
Block a user