switch to jdk 21

3 files changed, 15 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b67252c65915..4fa3eb8090e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = bookman-cockpit
 	pkgdesc = Bookman Cockpit
 	pkgver = 1.13.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.bookman.de/
 	arch = any
 	license = custom
-	makedepends = jdk17-openjdk
+	makedepends = jdk-openjdk>=21
+	makedepends = jdk-openjdk<22
 	makedepends = unzip
-	depends = java-environment=17
-	depends = java17-openjfx
+	depends = java-environment=21
+	depends = java-openjfx>=21
+	depends = java-openjfx<22
 	options = !strip
 	source = installer-1.13.3.exe::https://bit.ly/3eMJh3j
 	source = https://maven.ej-technologies.com/repository/com/install4j/install4j-runtime/9.0.7/install4j-runtime-9.0.7.jar
@@ -23,6 +25,6 @@ pkgbase = bookman-cockpit
 	sha256sums = f2a742dabb4f1ac32867c3ba152355695220e4bd4a7ba032de98e3c5d2ed3309
 	sha256sums = ef6cf40ff0a46853f2d5308c884e17328a6a36009f5697d5914bfbb720cac261
 	sha256sums = 32db57235ad25fadb8b2a4a02f7618c7a51df33b50df780613f06cb33fb977e3
-	sha256sums = 2d785d3b556ecd4659d8664ed6399ce252cf370f2bbbd9f25dc01b93283a7881
+	sha256sums = 688bf68cbde688cbaf925667fb6b5fe6237e02715e83b4e42d10ce85554e8bf6
 
 pkgname = bookman-cockpit
diff --git a/PKGBUILD b/PKGBUILD
index 383f0beda28f..724fbe58f7cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Phillip Schichtel <phillip@schich.tel>
 pkgname=bookman-cockpit
 pkgver=1.13.3
-pkgrel=1
+pkgrel=2
 options=(!strip)
 pkgdesc="Bookman Cockpit"
 arch=(any)
 url="https://www.bookman.de/"
 license=('custom')
-depends=('java-environment=17' 'java17-openjfx')
-makedepends=('jdk17-openjdk' 'unzip')
+depends=('java-environment=21' 'java-openjfx>=21' 'java-openjfx<22')
+makedepends=('jdk-openjdk>=21' 'jdk-openjdk<22' 'unzip')
 # the bit.ly link looks suspicious, but that's what they use on their website.
 # Also the download is not versioned, so this will eventuelly break due to integrity checks failing.
 source=("installer-${pkgver}.exe::https://bit.ly/3eMJh3j"
@@ -24,10 +24,10 @@ sha256sums=('61395f34e203083e5674c1169e86fb3c224c5998e2088ef80bdb541081eab4e9'
             'f2a742dabb4f1ac32867c3ba152355695220e4bd4a7ba032de98e3c5d2ed3309'
             'ef6cf40ff0a46853f2d5308c884e17328a6a36009f5697d5914bfbb720cac261'
             '32db57235ad25fadb8b2a4a02f7618c7a51df33b50df780613f06cb33fb977e3'
-            '2d785d3b556ecd4659d8664ed6399ce252cf370f2bbbd9f25dc01b93283a7881')
+            'af96d708f33472671d8accd0729d93c53379ed8360d057208a19f7233bd6be7d')
 
 build() {
-    export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
+    export JAVA_HOME=/usr/lib/jvm/java-21-openjdk
 
     "$JAVA_HOME/bin/javac" -d "$srcdir/classes" "OperatingSystemUtil.java"
     unzip -p "bin/bookman-${pkgver}.jar" 'icons/bookman.png' > bookman.png
diff --git a/bookman-cockpit.sh b/bookman-cockpit.sh
index f841f205abea..f0bf57684724 100644
--- a/bookman-cockpit.sh
+++ b/bookman-cockpit.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
+export JAVA_HOME=/usr/lib/jvm/java-21-openjdk
 home="${XDG_CONFIG_HOME:-"$HOME/.config"}/bookman-cockpit"
+jfx_libs='/usr/lib/jvm/java-21-openjfx/lib'
 
 "${JAVA_HOME}/bin/java" \
     -Duser.home="$home" \
@@ -9,6 +10,6 @@ home="${XDG_CONFIG_HOME:-"$HOME/.config"}/bookman-cockpit"
     -Dde.bookman.javaBackendUri=https://cockpit.bookman-gmbh.de/api/java/ \
     -Dde.bookman.microsoftApplicationId=a7719d9a-1877-4bd1-a3c7-e3f8edf86485 \
     -Dde.bookman.microsoftSsoRedirectUrl=http://localhost:4826 \
-    -cp "/opt/bookman-cockpit/override/:${JAVA_HOME}/lib/*:/opt/bookman-cockpit/jars/*" \
+    -cp "/opt/bookman-cockpit/override/:${jfx_libs}/*:/opt/bookman-cockpit/jars/*" \
     de.bookman.start.MainGradle