From 4043e3f71f9f2dd908814a54700ae0e52582e163 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 6 Sep 2023 16:22:41 +0200 Subject: [PATCH 1/9] build using JDK 21 --- .github/workflows/appimage-amd64.yml | 4 ++-- .github/workflows/build.yml | 4 ++-- .github/workflows/debian.yml | 4 ++-- .github/workflows/get-version.yml | 4 ++-- .github/workflows/mac-dmg.yml | 4 ++-- .github/workflows/pullrequest.yml | 4 ++-- .github/workflows/win-exe.yml | 4 ++-- .idea/compiler.xml | 23 +++++++++++------------ .idea/misc.xml | 2 +- pom.xml | 6 ++++-- 10 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.github/workflows/appimage-amd64.yml b/.github/workflows/appimage-amd64.yml index dbc180473..14da19fc1 100644 --- a/.github/workflows/appimage-amd64.yml +++ b/.github/workflows/appimage-amd64.yml @@ -10,8 +10,8 @@ on: required: false env: - JAVA_DIST: 'temurin' - JAVA_VERSION: 20 + JAVA_DIST: 'zulu' + JAVA_VERSION: 21-ea 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' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13acee970..df7d13b0f 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-ea defaults: run: diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 14cdca80a..281e570ee 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -16,8 +16,8 @@ on: type: boolean env: - JAVA_DIST: 'temurin' - JAVA_VERSION: 20 + JAVA_DIST: 'zulu' + JAVA_VERSION: 21-ea 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' diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml index 44f5ccd85..543789d04 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-ea jobs: determine-version: diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index fe10ce531..63c7cf5c4 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-ea OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/20.0.2/openjfx-20.0.2_osx-x64_bin-jmods.zip' OPENJFX_JMODS_AMD64_HASH: '55b8ff7453d59c89ae129f6c9c5ad7b09a5d359568811b376ac1766c14d6a17c' OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/20.0.2/openjfx-20.0.2_osx-aarch64_bin-jmods.zip' diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 14146d0cb..b7409acfa 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-ea defaults: run: diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 066b7d49e..6747199c7 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-ea 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 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 07deef6c0..cd0fcf82e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ UTF-8 - 20 + 21 @@ -38,7 +38,7 @@ 1.2.2 1.2.1 1.3.0-beta6 - 3.0.0 + 4.0.0-beta1 2.0.0 2.0.3 @@ -509,11 +509,13 @@ + From aa382ce80de1e519ad30a6fca8a666e404961697 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 18 Sep 2023 19:10:54 +0200 Subject: [PATCH 2/9] update coffeelibs jdk to 21 --- .github/workflows/debian.yml | 3 ++- dist/linux/debian/control | 2 +- dist/linux/debian/rules | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 281e570ee..1261224f2 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -18,6 +18,7 @@ on: env: JAVA_DIST: 'zulu' JAVA_VERSION: 21-ea + 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/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 231f2a1d5..912395bce 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 From 70805665bf8dec2ba4d17a2d049f3e98e76b9548 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 18 Sep 2023 19:21:56 +0200 Subject: [PATCH 3/9] use features of Java 21 with `--enable-preview` --- .idea/misc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index a85576869..ee700a1c2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file From 8e9d54b44b4b4c7a54ec5074165869504cb6f0ca Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 18 Sep 2023 19:27:28 +0200 Subject: [PATCH 4/9] rename unused var --- src/main/java/org/cryptomator/ipc/IpcMessageListener.java | 2 +- .../java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java index 756305cbe..284ed075b 100644 --- a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java +++ b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java @@ -6,7 +6,7 @@ public interface IpcMessageListener { default void handleMessage(IpcMessage message) { switch (message) { - case RevealRunningAppMessage m -> revealRunningApp(); // TODO: rename to _ with JEP 443 + case RevealRunningAppMessage _ -> revealRunningApp(); case HandleLaunchArgsMessage m -> handleLaunchArgs(m.args()); } } diff --git a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java index 012097e33..ba6b2ef74 100644 --- a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java +++ b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java @@ -109,7 +109,7 @@ public class AwtTrayMenuController implements TrayMenuController { menuItem.setEnabled(a.enabled()); menu.add(menuItem); } - case SeparatorItem s -> menu.addSeparator(); // TODO: rename to _ with JEP 443 + case SeparatorItem _ -> menu.addSeparator(); case SubMenuItem s -> { var submenu = new Menu(s.title()); addChildren(submenu, s.items()); From 6c5ee14c7309aec4a0ea4ea14e854e66ed3f2358 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 18 Sep 2023 19:29:35 +0200 Subject: [PATCH 5/9] rename unused var --- src/main/java/org/cryptomator/ui/health/StartController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/health/StartController.java b/src/main/java/org/cryptomator/ui/health/StartController.java index 4e95b6b0f..917ba8095 100644 --- a/src/main/java/org/cryptomator/ui/health/StartController.java +++ b/src/main/java/org/cryptomator/ui/health/StartController.java @@ -103,8 +103,8 @@ public class StartController implements FxController { private void loadingKeyFailed(Throwable e) { switch (e) { - case UnlockCancelledException uce -> {} //ok - case VaultKeyInvalidException vkie -> { + case UnlockCancelledException _ -> {} //ok + case VaultKeyInvalidException _ -> { LOG.error("Invalid key"); //TODO: specific error screen appWindows.showErrorWindow(e, window, null); } From c10dc7481850744b9c29c99be7eae14acba9aa2c Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 25 Sep 2023 12:12:28 +0200 Subject: [PATCH 6/9] update integrations-linux to 1.4.0-beta1 --- pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8f08ebdf3..a62120a4d 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 1.3.0 1.2.2 1.2.1 - 1.3.0-beta6 + 1.4.0-beta1 4.0.0-beta1 2.0.0 2.0.4 @@ -509,13 +509,11 @@ - From 943374856e9aaab3f68720bc2a8bb12b2876b741 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 25 Sep 2023 12:18:01 +0200 Subject: [PATCH 7/9] build using JDK 21 GA --- .github/workflows/appimage.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/debian.yml | 2 +- .github/workflows/get-version.yml | 2 +- .github/workflows/mac-dmg.yml | 2 +- .github/workflows/pullrequest.yml | 2 +- .github/workflows/win-exe.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 25892a0dd..a5c393a9a 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -11,7 +11,7 @@ on: env: JAVA_DIST: 'zulu' - JAVA_VERSION: 21-ea + JAVA_VERSION: 21 jobs: get-version: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df7d13b0f..8ac352b5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ on: env: JAVA_DIST: 'zulu' - JAVA_VERSION: 21-ea + JAVA_VERSION: 21 defaults: run: diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index e791b5c49..d16b2936f 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -17,7 +17,7 @@ on: env: JAVA_DIST: 'zulu' - JAVA_VERSION: 21-ea + 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' diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml index 543789d04..48cc95af8 100644 --- a/.github/workflows/get-version.yml +++ b/.github/workflows/get-version.yml @@ -23,7 +23,7 @@ on: env: JAVA_DIST: 'zulu' - JAVA_VERSION: 21-ea + JAVA_VERSION: 21 jobs: determine-version: diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 1e32b7960..6e6aee590 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -16,7 +16,7 @@ on: env: JAVA_DIST: 'zulu' - JAVA_VERSION: 21-ea + JAVA_VERSION: 21 jobs: get-version: diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index b7409acfa..161e6c072 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -5,7 +5,7 @@ on: env: JAVA_DIST: 'zulu' - JAVA_VERSION: 21-ea + JAVA_VERSION: 21 defaults: run: diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 6747199c7..be1229f1a 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -15,7 +15,7 @@ on: env: JAVA_DIST: 'zulu' - JAVA_VERSION: 21-ea + 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' From 83879f5cfed647e435d1c9a11569670697e58c68 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 9 Oct 2023 16:19:56 +0200 Subject: [PATCH 8/9] revert 8e9d54b & 6c5ee14 due to bug in JDK 21 see https://bugs.openjdk.org/browse/JDK-8313323 --- .../org/cryptomator/ipc/IpcMessageListener.java | 2 +- .../org/cryptomator/ui/health/StartController.java | 14 +++++++------- .../ui/traymenu/AwtTrayMenuController.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java index 284ed075b..756305cbe 100644 --- a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java +++ b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java @@ -6,7 +6,7 @@ public interface IpcMessageListener { default void handleMessage(IpcMessage message) { switch (message) { - case RevealRunningAppMessage _ -> revealRunningApp(); + case RevealRunningAppMessage m -> revealRunningApp(); // TODO: rename to _ with JEP 443 case HandleLaunchArgsMessage m -> handleLaunchArgs(m.args()); } } diff --git a/src/main/java/org/cryptomator/ui/health/StartController.java b/src/main/java/org/cryptomator/ui/health/StartController.java index 917ba8095..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 _ -> {} //ok - case VaultKeyInvalidException _ -> { - 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); } } } diff --git a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java index ba6b2ef74..012097e33 100644 --- a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java +++ b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java @@ -109,7 +109,7 @@ public class AwtTrayMenuController implements TrayMenuController { menuItem.setEnabled(a.enabled()); menu.add(menuItem); } - case SeparatorItem _ -> menu.addSeparator(); + case SeparatorItem s -> menu.addSeparator(); // TODO: rename to _ with JEP 443 case SubMenuItem s -> { var submenu = new Menu(s.title()); addChildren(submenu, s.items()); From 2e2aa77727c212a1751c3a0a10c73bda77463e04 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 16 Oct 2023 16:19:11 +0200 Subject: [PATCH 9/9] update dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dbf3967db..d4444149c 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 1.3.0 1.2.3 1.2.2 - 1.4.0-beta1 + 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