diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 8bc12fcb4..08b433ca9 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -50,7 +50,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: '25.0.2+10.0.LTS' + JAVA_VERSION: '26.0.1+8' VERSION_NUM: ${{ inputs.semVerNum || '99.99.99'}} REVISION_NUM: ${{ inputs.revisionNum || '0' }} VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4061626ad..415888b02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: 25 + JAVA_VERSION: 26 defaults: run: diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 140120f4a..6c2a0eb9f 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -25,7 +25,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: '25.0.2+10.0.LTS' + JAVA_VERSION: '26.0.1+8' DEB_BUILD_DEPENDS: 'debhelper (>=10), openjdk-25-jdk (>= 25+36), libgtk-3-0 (>= 3.20.0), libxxf86vm1, libgl1' OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/25.0.2/openjfx-25.0.2_linux-x64_bin-jmods.zip' OPENJFX_JMODS_AMD64_HASH: 'e0a9c29d8cf3af9b8b48848b43f87b5785bc107c53a951b19668ce05842bba1b' diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index 4ffcb9ff1..49dee5b9c 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -11,7 +11,7 @@ jobs: with: runner-os: 'ubuntu-latest' java-distribution: 'temurin' - java-version: 25 + java-version: 26 secrets: nvd-api-key: ${{ secrets.NVD_API_KEY }} ossindex-username: ${{ secrets.OSSINDEX_USERNAME }} diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 57a93b7d9..390880d68 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -7,7 +7,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: '25.0.2+10.0.LTS' + JAVA_VERSION: '26.0.1+8' defaults: run: diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml index def7ed98e..65358d62f 100644 --- a/.github/workflows/get-version.yml +++ b/.github/workflows/get-version.yml @@ -26,7 +26,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: 25 + JAVA_VERSION: 26 jobs: determine-version: diff --git a/.github/workflows/mac-dmg-x64.yml b/.github/workflows/mac-dmg-x64.yml index 550be16a8..5a635f2ce 100644 --- a/.github/workflows/mac-dmg-x64.yml +++ b/.github/workflows/mac-dmg-x64.yml @@ -56,7 +56,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: '25.0.2+10.0.LTS' + JAVA_VERSION: '26.0.1+8' VERSION_NUM: ${{ inputs.semVerNum || '99.99.99'}} REVISION_NUM: ${{ inputs.revisionNum || '0' }} VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}} diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 683e5ab76..ce17bb970 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -54,7 +54,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: '25.0.2+10.0.LTS' + JAVA_VERSION: '26.0.1+8' VERSION_NUM: ${{ inputs.semVerNum || '99.99.99'}} REVISION_NUM: ${{ inputs.revisionNum || '0' }} VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}} diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index a0f6beefe..03837dcb3 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -5,7 +5,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: 25 + JAVA_VERSION: 26 defaults: run: diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml index bae89301d..8ebef4dfd 100644 --- a/.github/workflows/release-check.yml +++ b/.github/workflows/release-check.yml @@ -12,7 +12,7 @@ defaults: env: JAVA_DIST: 'temurin' - JAVA_VERSION: 25 + JAVA_VERSION: 26 jobs: check-preconditions: diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index fc8937459..2c8266adc 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -6,10 +6,10 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) ifeq ($(DEB_BUILD_ARCH),amd64) -JAVA_HOME = /usr/lib/jvm/java-25-openjdk-amd64 +JAVA_HOME = /usr/lib/jvm/java-26-openjdk-amd64 JMODS_PATH = jmods/amd64:${JAVA_HOME}/jmods else ifeq ($(DEB_BUILD_ARCH),arm64) -JAVA_HOME = /usr/lib/jvm/java-25-openjdk-arm64 +JAVA_HOME = /usr/lib/jvm/java-26-openjdk-arm64 JMODS_PATH = jmods/aarch64:${JAVA_HOME}/jmods endif diff --git a/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml b/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml index 4d7c3f4d0..97aaefea4 100644 --- a/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml +++ b/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml @@ -150,14 +150,14 @@ modules: dest-filename: jdk.tar.gz only-arches: - x86_64 - url: https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.2%2B10/OpenJDK25U-jdk_x64_linux_hotspot_25.0.2_10.tar.gz - sha512: 29043fde119a031c2ca8d57aed445fedd9e7f74608fcdc7a809076ba84cfd1c31f08de2ecccf352e159fdcd1cae172395ed46363007552ff242057826c81ab3a + url: https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_x64_linux_hotspot_26.0.1_8.tar.gz + sha512: eb46cda97ffd46e2e0c1f6f977dc204d9cc969b958946287b7e7d0bfe859fd92faccb2f6ef79995421a963c6de140c436af559403e0a2cd27c90b06c20260d5c - type: file dest-filename: jdk.tar.gz only-arches: - aarch64 - url: https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.2%2B10/OpenJDK25U-jdk_aarch64_linux_hotspot_25.0.2_10.tar.gz - sha512: f1d3ccec3e1f1bed9d632f14b9223709d6e5c2e0d922125d068870dd3016492a2ca8f08924d4a9d0dc5eb2159fa09efee366a748fd0093475baf29e5c70c781a + url: https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_aarch64_linux_hotspot_26.0.1_8.tar.gz + sha512: 3c31671552712a8f0df96df2eeae7e9ad5156c0e98ebd5bf4fa04c14bba58bd5e19ff567ddcdc7aa478f6f4b0a852762a09bd88d3132acb121e667cfe0397034 - type: file dest-filename: openjfx.zip only-arches: diff --git a/dist/linux/makepkg/PKGBUILD.template b/dist/linux/makepkg/PKGBUILD.template index e29a4396c..a7051a3d1 100644 --- a/dist/linux/makepkg/PKGBUILD.template +++ b/dist/linux/makepkg/PKGBUILD.template @@ -14,7 +14,7 @@ license=('GPL3') depends=('fuse3' 'alsa-lib' 'hicolor-icon-theme' 'libxtst' 'libnet' 'libxrender') makedepends=('maven' 'unzip') optdepends=('keepassxc-cryptomator: Use KeePassXC to store vault passwords' 'ttf-hanazono: Install this font when using Japanese system language') -_jdkver=25.0.2+10 +_jdkver=26.0.1+8 _jfxver=25.0.2 _src_app_dir=cryptomator-${pkgver//_/-} source=($SOURCES); @@ -24,9 +24,9 @@ source_aarch64=("jdk-${_jdkver}.tar.gz::https://github.com/adoptium/temurin${_jd "openjfx-${_jfxver}.zip::https://download2.gluonhq.com/openjfx/${_jfxver}/openjfx-${_jfxver}_linux-aarch64_bin-jmods.zip") noextract=("jdk-${_jdkver}.tar.gz" "openjfx-${_jfxver}.zip") sha256sums=($SOURCES_SHA) -sha256sums_x86_64=('987387933b64b9833846dee373b640440d3e1fd48a04804ec01a6dbf718e8ab8' +sha256sums_x86_64=('8e512f13e575a43655fc92319436c94890c137b9035cc6bd6f9cf24239704d3a' 'e0a9c29d8cf3af9b8b48848b43f87b5785bc107c53a951b19668ce05842bba1b') -sha256sums_aarch64=('a9d73e711d967dc44896d4f430f73a68fd33590dabc29a7f2fb9f593425b854c' +sha256sums_aarch64=('613f9b2861dea937b24d5eca745ef8567733b377d0bb612195acaad0e3f61360' 'c3408f818693cce09e59829a8e862a82c7695fdfcd585c41cfd527f5fc3fe646') options=('!strip')