diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index ee89a17ec..15c1ea3a9 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -10,8 +10,8 @@ on:
required: false
env:
- JAVA_DIST: 'temurin'
- JAVA_VERSION: 20
+ JAVA_DIST: 'zulu'
+ JAVA_VERSION: 21
jobs:
get-version:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1416c3809..fbb57cbbf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,8 +6,8 @@ on:
types: [labeled]
env:
- JAVA_DIST: 'temurin'
- JAVA_VERSION: 20
+ JAVA_DIST: 'zulu'
+ JAVA_VERSION: 21
defaults:
run:
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index 6c1a68944..054d6cadf 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -16,8 +16,9 @@ on:
type: boolean
env:
- JAVA_DIST: 'temurin'
- JAVA_VERSION: 20
+ JAVA_DIST: 'zulu'
+ JAVA_VERSION: 21
+ COFFEELIBS_JDK_VERSION: 21
OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/20.0.2/openjfx-20.0.2_linux-x64_bin-jmods.zip'
OPENJFX_JMODS_AMD64_HASH: 'f522ac2ae4bdd61f0219b7b8d2058ff72a22f36a44378453bcfdcd82f8f5e08c'
OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/20.0.2/openjfx-20.0.2_linux-aarch64_bin-jmods.zip'
@@ -42,7 +43,7 @@ jobs:
run: |
sudo add-apt-repository ppa:coffeelibs/openjdk
sudo apt-get update
- sudo apt-get install debhelper devscripts dput coffeelibs-jdk-${{ env.JAVA_VERSION }} libgtk2.0-0
+ sudo apt-get install debhelper devscripts dput coffeelibs-jdk-${{ env.COFFEELIBS_JDK_VERSION }} libgtk2.0-0
- name: Setup Java
uses: actions/setup-java@v3
with:
diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml
index f05d7742a..1bed1cff8 100644
--- a/.github/workflows/get-version.yml
+++ b/.github/workflows/get-version.yml
@@ -22,8 +22,8 @@ on:
value: ${{ jobs.determine-version.outputs.type }}
env:
- JAVA_DIST: 'temurin'
- JAVA_VERSION: 20
+ JAVA_DIST: 'zulu'
+ JAVA_VERSION: 21
jobs:
determine-version:
diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml
index ea6fed274..8db4296d9 100644
--- a/.github/workflows/mac-dmg.yml
+++ b/.github/workflows/mac-dmg.yml
@@ -15,8 +15,8 @@ on:
type: boolean
env:
- JAVA_DIST: 'temurin'
- JAVA_VERSION: 20
+ JAVA_DIST: 'zulu'
+ JAVA_VERSION: 21
jobs:
get-version:
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 9b615756a..931817418 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -4,8 +4,8 @@ on:
pull_request:
env:
- JAVA_DIST: 'temurin'
- JAVA_VERSION: 20
+ JAVA_DIST: 'zulu'
+ JAVA_VERSION: 21
defaults:
run:
diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml
index 024f38696..2b72a50a8 100644
--- a/.github/workflows/win-exe.yml
+++ b/.github/workflows/win-exe.yml
@@ -14,8 +14,8 @@ on:
env:
- JAVA_DIST: 'temurin'
- JAVA_VERSION: 20
+ JAVA_DIST: 'zulu'
+ JAVA_VERSION: 21
OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/20.0.2/openjfx-20.0.2_windows-x64_bin-jmods.zip'
OPENJFX_JMODS_AMD64_HASH: '18625bbc13c57dbf802486564247a8d8cab72ec558c240a401bf6440384ebd77'
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1d25cbef3..df360a26d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -14,10 +14,10 @@
-
-
+
+
-
+
@@ -26,20 +26,19 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 891096945..ee700a1c2 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 b04812fbb..148fdb213 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-20, libgtk2.0-0, libgtk-3-0, libxxf86vm1, libgl1
+Build-Depends: debhelper (>=10), coffeelibs-jdk-21, libgtk2.0-0, 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 c12879025..d0a12e380 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-20-coffeelibs
+JAVA_HOME = /usr/lib/jvm/java-21-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 2c6faa90c..d4444149c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
UTF-8
- 20
+ 21
@@ -37,8 +37,8 @@
1.3.0
1.2.3
1.2.2
- 1.3.0
- 3.0.0
+ 1.4.0-beta2
+ 4.0.0-beta1
2.0.0
2.0.4
@@ -64,7 +64,7 @@
24.0.1
8.4.0
- 0.8.10
+ 0.8.11
2.2.0
1.2.1
3.11.0
diff --git a/src/main/java/org/cryptomator/ui/health/StartController.java b/src/main/java/org/cryptomator/ui/health/StartController.java
index 4e95b6b0f..9ff2502da 100644
--- a/src/main/java/org/cryptomator/ui/health/StartController.java
+++ b/src/main/java/org/cryptomator/ui/health/StartController.java
@@ -101,16 +101,16 @@ public class StartController implements FxController {
}
}
- private void loadingKeyFailed(Throwable e) {
- switch (e) {
- case UnlockCancelledException uce -> {} //ok
- case VaultKeyInvalidException vkie -> {
- LOG.error("Invalid key"); //TODO: specific error screen
+ private void loadingKeyFailed(Throwable t) {
+ switch (t) {
+ case UnlockCancelledException e -> {} // ok // TODO: rename to _ with JEP 443
+ case VaultKeyInvalidException e -> { // TODO: rename to _ with JEP 443
+ LOG.error("Invalid key"); // TODO: specific error screen
appWindows.showErrorWindow(e, window, null);
}
default -> {
- LOG.error("Failed to load key.", e);
- appWindows.showErrorWindow(e, window, null);
+ LOG.error("Failed to load key.", t);
+ appWindows.showErrorWindow(t, window, null);
}
}
}