diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 33df09faf..11e1b20b1 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -29,8 +29,8 @@ jobs: include: - os: ubuntu-latest appimage-suffix: x86_64 - openjfx-url: 'https://download2.gluonhq.com/openjfx/21.0.2/openjfx-21.0.2_linux-x64_bin-jmods.zip' - openjfx-sha: '49703558356649ef1335d12839f55b4c391d72a2e43a525638f1a38c799a6fdc' + openjfx-url: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-x64_bin-jmods.zip' + openjfx-sha: '7baed11ca56d5fee85995fa6612d4299f1e8b7337287228f7f12fd50407c56f8' - os: [self-hosted, Linux, ARM64] appimage-suffix: aarch64 openjfx-url: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-aarch64_bin-jmods.zip' diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 62bec15d6..e087df1e1 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -20,8 +20,8 @@ env: JAVA_VERSION: '21.0.2+13' COFFEELIBS_JDK: 21 COFFEELIBS_JDK_VERSION: '21.0.2+13-0ppa1' - OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/21.0.2/openjfx-21.0.2_linux-x64_bin-jmods.zip' - OPENJFX_JMODS_AMD64_HASH: '49703558356649ef1335d12839f55b4c391d72a2e43a525638f1a38c799a6fdc' + OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-x64_bin-jmods.zip' + OPENJFX_JMODS_AMD64_HASH: '7baed11ca56d5fee85995fa6612d4299f1e8b7337287228f7f12fd50407c56f8' OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-aarch64_bin-jmods.zip' OPENJFX_JMODS_AARCH64_HASH: '871e7b9d7af16aef2e55c1b7830d0e0b2503b13dd8641374ba7e55ecb81d2ef9' diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 2652f019f..566706c67 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -37,15 +37,15 @@ jobs: output-suffix: x64 xcode-path: '/Applications/Xcode_13.2.1.app' fuse-lib: macFUSE - openjfx-url: 'https://download2.gluonhq.com/openjfx/21.0.2/openjfx-21.0.2_osx-x64_bin-jmods.zip' - openjfx-sha: '9192802e1dbe19781a2c38f82961677065202b3c9f701f1e0fa08bfe05cc0e74' + openjfx-url: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_osx-x64_bin-jmods.zip' + openjfx-sha: 'bd6abab20da73d5a968dcf2fd915d81b5fb919340e3bb84979ee9a888a829939' - os: [self-hosted, macOS, ARM64] architecture: aarch64 output-suffix: arm64 xcode-path: '/Applications/Xcode_13.2.1.app' fuse-lib: FUSE-T - openjfx-url: 'https://download2.gluonhq.com/openjfx/21.0.2/openjfx-21.0.2_osx-aarch64_bin-jmods.zip' - openjfx-sha: '5d12bc422a4d9ed29c6b40979a6009a00b86a677971fdff5314b879136e39688' + openjfx-url: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_osx-aarch64_bin-jmods.zip' + openjfx-sha: '7afaa1c57a6cc3c384d636e597b9a5364693e2db4aaec0a6e63d2fa964400b58' steps: - uses: actions/checkout@v4 - name: Setup Java diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index e99b72a81..b2f238d7d 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -16,8 +16,8 @@ on: env: JAVA_DIST: 'zulu' JAVA_VERSION: '21.0.2+13' - OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/21.0.2/openjfx-21.0.2_windows-x64_bin-jmods.zip' - OPENJFX_JMODS_AMD64_HASH: 'de0dd27cc237897481f58cfb90855825d0ad36682838eed27b79e061eeb79d68' + OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_windows-x64_bin-jmods.zip' + OPENJFX_JMODS_AMD64_HASH: 'daf8acae631c016c24cfe23f88469400274d3441dd890615a42dfb501f3eb94a' WINFSP_MSI: 'https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi' WINFSP_UNINSTALLER: 'https://github.com/cryptomator/winfsp-uninstaller/releases/download/1.0.0/winfsp-uninstaller.exe' diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index 4f198be53..6af5b5663 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -25,8 +25,8 @@ cp ../../../target/cryptomator-*.jar ../../../target/mods # download javaFX jmods -OPENJFX_URL='https://download2.gluonhq.com/openjfx/21.0.2/openjfx-21.0.2_linux-x64_bin-jmods.zip' -OPENJFX_SHA='49703558356649ef1335d12839f55b4c391d72a2e43a525638f1a38c799a6fdc' +OPENJFX_URL='https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-x64_bin-jmods.zip' +OPENJFX_SHA='7baed11ca56d5fee85995fa6612d4299f1e8b7337287228f7f12fd50407c56f8' OPENJFX_URL_aarch64='https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_linux-aarch64_bin-jmods.zip' OPENJFX_SHA_aarch64='871e7b9d7af16aef2e55c1b7830d0e0b2503b13dd8641374ba7e55ecb81d2ef9' diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index 14c5b88ff..df699aad1 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -35,7 +35,7 @@ if [ "$(machine)" = "arm64e" ]; then else ARCH="x64" fi -OPENJFX_JMODS="https://download2.gluonhq.com/openjfx/21.0.2/openjfx-21.0.2_osx-${ARCH}_bin-jmods.zip" +OPENJFX_JMODS="https://download2.gluonhq.com/openjfx/21.0.1/openjfx-21.0.1_osx-${ARCH}_bin-jmods.zip" # check preconditions if [ -z "${JAVA_HOME}" ]; then echo "JAVA_HOME not set. Run using JAVA_HOME=/path/to/jdk ./build.sh"; exit 1; fi diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 2d671e354..7b1f7cc47 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -51,9 +51,9 @@ if ($clean -and (Test-Path -Path $runtimeImagePath)) { } ## download jfx jmods -$jmodsVersion='21.0.2' +$jmodsVersion='21.0.1' $jmodsUrl = "https://download2.gluonhq.com/openjfx/${jmodsVersion}/openjfx-${jmodsVersion}_windows-x64_bin-jmods.zip" -$jfxJmodsChecksum = 'de0dd27cc237897481f58cfb90855825d0ad36682838eed27b79e061eeb79d68' +$jfxJmodsChecksum = 'daf8acae631c016c24cfe23f88469400274d3441dd890615a42dfb501f3eb94a' $jfxJmodsZip = '.\resources\jfxJmods.zip' if( !(Test-Path -Path $jfxJmodsZip) ) { Write-Output "Downloading ${jmodsUrl}..." diff --git a/pom.xml b/pom.xml index b4d634a10..666aee7c3 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 2.2 32.1.3-jre 2.16.0 - 21.0.2 + 21.0.1 4.4.0 9.37.3 1.4.14