revert to java 22 and javafx 24 due to bug in jpackage launcher linking (jdk-8345810)

This commit is contained in:
Craig Raw 2025-10-01 11:52:45 +02:00
parent ca8553ecb8
commit c3d3fd1fda
2 changed files with 5 additions and 5 deletions

View file

@ -15,11 +15,11 @@ jobs:
- uses: actions/checkout@v5
with:
submodules: true
- name: Set up JDK 25
- name: Set up JDK 22.0.2
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '25.0.0'
java-version: '22.0.2'
- name: Show Build Versions
run: ./gradlew -v
- name: Build with Gradle

View file

@ -1,7 +1,7 @@
plugins {
id 'application'
id 'org-openjfx-javafxplugin'
id 'org.beryx.jlink' version '3.1.4-rc'
id 'org.beryx.jlink' version '3.1.3'
id 'org.gradlex.extra-java-module-info' version '1.13'
id 'io.matthewnelson.kmp.tor.resource-filterjar' version '408.16.3'
}
@ -27,13 +27,13 @@ repositories {
maven { url = uri('https://code.sparrowwallet.com/api/packages/sparrowwallet/maven') }
}
tasks.withType(AbstractArchiveTask) {
tasks.withType(AbstractArchiveTask).configureEach {
preserveFileTimestamps = false
reproducibleFileOrder = true
}
javafx {
version = headless ? "18" : "25"
version = headless ? "18" : "24.0.2"
modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ]
}