diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index 40ea6638f..44fd774e0 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -19,7 +19,7 @@ on:
env:
JAVA_DIST: 'temurin'
- JAVA_VERSION: '24.0.1+9'
+ JAVA_VERSION: '25.0.0+36'
jobs:
get-version:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0b5a1f6c9..2ded79b7d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ on:
env:
JAVA_DIST: 'temurin'
- JAVA_VERSION: 24
+ JAVA_VERSION: 25
defaults:
run:
diff --git a/.github/workflows/check-jdk-updates.yml b/.github/workflows/check-jdk-updates.yml
index 8d40a6892..967b2ed80 100644
--- a/.github/workflows/check-jdk-updates.yml
+++ b/.github/workflows/check-jdk-updates.yml
@@ -6,7 +6,7 @@ on:
workflow_dispatch:
env:
- JDK_VERSION: '24.0.1+9'
+ JAVA_VERSION: '25.0.0+36'
JDK_VENDOR: temurin
RUNTIME_VERSION_HELPER: >
public class Test {
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index 6ea0d7442..2fc761230 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -23,9 +23,9 @@ on:
env:
JAVA_DIST: 'temurin'
- JAVA_VERSION: '24.0.1+9'
- COFFEELIBS_JDK: 24
- COFFEELIBS_JDK_VERSION: '24.0.1+9-0ppa3'
+ JAVA_VERSION: '25.0.0+36'
+ COFFEELIBS_JDK: 25
+ COFFEELIBS_JDK_VERSION: '25.0.0+36-0ppa3' #TODO: update coffeelibs
OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/24.0.1/openjfx-24.0.1_linux-x64_bin-jmods.zip'
OPENJFX_JMODS_AMD64_HASH: '425fac742b9fbd095b2ce868cff82d1024620f747c94a7144d0a4879e756146c'
OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/24.0.1/openjfx-24.0.1_linux-aarch64_bin-jmods.zip'
diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml
index b44604490..6db100254 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: 24
+ java-version: 25
check-command: 'mvn -B validate -Pdependency-check -Djavafx.platform=linux'
secrets:
nvd-api-key: ${{ secrets.NVD_API_KEY }}
diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml
index d24b5692c..7fc1c09b5 100644
--- a/.github/workflows/get-version.yml
+++ b/.github/workflows/get-version.yml
@@ -23,7 +23,7 @@ on:
env:
JAVA_DIST: 'temurin'
- JAVA_VERSION: 24
+ JAVA_VERSION: 25
jobs:
determine-version:
diff --git a/.github/workflows/mac-dmg-x64.yml b/.github/workflows/mac-dmg-x64.yml
index 1fd251ac4..193c6788f 100644
--- a/.github/workflows/mac-dmg-x64.yml
+++ b/.github/workflows/mac-dmg-x64.yml
@@ -24,7 +24,7 @@ on:
env:
JAVA_DIST: 'temurin'
- JAVA_VERSION: '24.0.1+9'
+ JAVA_VERSION: '25.0.0+36'
jobs:
get-version:
diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml
index 953780ae6..1d6b3dc66 100644
--- a/.github/workflows/mac-dmg.yml
+++ b/.github/workflows/mac-dmg.yml
@@ -22,7 +22,7 @@ on:
env:
JAVA_DIST: 'temurin'
- JAVA_VERSION: '24.0.1+9'
+ JAVA_VERSION: '25.0.0+36'
jobs:
get-version:
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 98da25f91..0047fc37e 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -5,7 +5,7 @@ on:
env:
JAVA_DIST: 'temurin'
- JAVA_VERSION: 24
+ JAVA_VERSION: 25
defaults:
run:
diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml
index 3c3643a64..ab0c1c8e8 100644
--- a/.github/workflows/release-check.yml
+++ b/.github/workflows/release-check.yml
@@ -12,7 +12,7 @@ defaults:
env:
JAVA_DIST: 'temurin'
- JAVA_VERSION: 23
+ JAVA_VERSION: 25
jobs:
check-preconditions:
diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml
index 08e19321e..0fa4a42c5 100644
--- a/.github/workflows/win-exe.yml
+++ b/.github/workflows/win-exe.yml
@@ -51,13 +51,13 @@ jobs:
include:
- arch: x64
os: windows-latest
- java-dist: 'zulu'
- java-version: '24.0.1+9'
+ java-dist: 'zulu' #TODO: is finally temurin possible?
+ java-version: '25.0.0+36'
java-package: 'jdk'
- arch: arm64
os: windows-11-arm
java-dist: 'liberica'
- java-version: '24.0.1+11'
+ java-version: '24.0.1+11' #TODO: which distro to use here?
java-package: 'jdk+fx' #This is needed, as liberica contains JFX 24 Jmods for Windows ARM64
steps:
- uses: actions/checkout@v5
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1256745d3..28d93ef1d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -14,15 +14,15 @@
-
-
+
+
-
+
-
-
+
+
@@ -38,7 +38,34 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index cbe05c79b..52746672a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
-
+
\ No newline at end of file
diff --git a/dist/linux/debian/control b/dist/linux/debian/control
index b0c2c6725..009d73ff5 100644
--- a/dist/linux/debian/control
+++ b/dist/linux/debian/control
@@ -2,7 +2,7 @@ Source: cryptomator
Maintainer: Cryptobot
Section: utils
Priority: optional
-Build-Depends: debhelper (>=10), coffeelibs-jdk-24 (>= 24.0.1+9-0ppa3), libgtk-3-0, libxxf86vm1, libgl1
+Build-Depends: debhelper (>=10), coffeelibs-jdk-25 (>= 24.0.1+9-0ppa3), libgtk-3-0, libxxf86vm1, libgl1
Standards-Version: 4.5.0
Homepage: https://cryptomator.org
Vcs-Git: https://github.com/cryptomator/cryptomator.git
diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules
index f69f4a789..d4edb1f79 100755
--- a/dist/linux/debian/rules
+++ b/dist/linux/debian/rules
@@ -4,7 +4,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-JAVA_HOME = /usr/lib/jvm/java-24-coffeelibs
+JAVA_HOME = /usr/lib/jvm/java-25-coffeelibs
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
ifeq ($(DEB_BUILD_ARCH),amd64)
JMODS_PATH = jmods/amd64:${JAVA_HOME}/jmods
diff --git a/pom.xml b/pom.xml
index d53108857..e05dd809d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
UTF-8
- 24
+ 25