Use latest Java

3 files changed, 17 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dcb69c448027..70748be631c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = miniongg
 	pkgdesc = Elder Scrolls Online and World of Warcraft Addon Manager
 	pkgver = 3.0.7_SNAPSHOT.r1.12dbc95e
-	pkgrel = 1
+	pkgrel = 2
 	url = https://minion.mmoui.com/
 	arch = any
 	license = custom
 	makedepends = unzip
-	depends = jdk8-openjdk
-	depends = java8-openjfx
+	depends = java-runtime
+	depends = java-openjfx
 	provides = miniongg
 	source = https://cdn.mmoui.com/minion/v3/MinionClientUpdate-12dbc95eff5898a64f584a3c697dad987c604af8.zip
 	source = https://cdn.mmoui.com/minion/v3/MinionLibsUpdate-81fcfa6cd281365b8e6c40c51e2fc931caf4101d.zip
@@ -17,7 +17,7 @@ pkgbase = miniongg
 	md5sums = 977dcbe4914fe452055d092083960f4c
 	md5sums = 862307f1f506b42a576c8d49e90eccbf
 	md5sums = 0e439acd67fab9625deae97f657615ba
-	md5sums = 8a35da141230c288000c70075c35fe8a
+	md5sums = 4e4379da15949ba28dabc3dc2678aa37
 	md5sums = cb92061ae2d15effbddc3b23600cfeaf
 
 pkgname = miniongg
diff --git a/PKGBUILD b/PKGBUILD
index 71de30ff92f2..f50d6391c739 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=miniongg
 pkgver=3.0.7_SNAPSHOT.r1.12dbc95e
-pkgrel=1
+pkgrel=2
 pkgdesc="Elder Scrolls Online and World of Warcraft Addon Manager"
 arch=('any')
 url='https://minion.mmoui.com/'
 license=('custom')
-depends=('jdk8-openjdk' 'java8-openjfx')
+depends=('java-runtime' 'java-openjfx')
 makedepends=('unzip')
 provides=("miniongg")
 
@@ -20,7 +20,7 @@ source=("https://cdn.mmoui.com/minion/v3/MinionClientUpdate-12dbc95eff5898a64f58
 md5sums=("977dcbe4914fe452055d092083960f4c"
 	"862307f1f506b42a576c8d49e90eccbf"
 	"0e439acd67fab9625deae97f657615ba"
-	"8a35da141230c288000c70075c35fe8a"
+	"4e4379da15949ba28dabc3dc2678aa37"
 	"cb92061ae2d15effbddc3b23600cfeaf")
 
 package() {
diff --git a/miniongg.sh b/miniongg.sh
index 5d36a0530641..978d2a97dcb6 100644
--- a/miniongg.sh
+++ b/miniongg.sh
@@ -1,2 +1,11 @@
 #!/bin/sh
-/usr/lib/jvm/java-8-openjdk/bin/java -jar /usr/share/java/minion/Minion-jfx.jar
+java --module-path=/usr/lib/jvm/default/lib/javafx.web.jar:/usr/lib/jvm/default/lib/javafx.graphics.jar:/usr/lib/jvm/default/lib/javafx.base.jar:/usr/lib/jvm/default/lib/javafx.swing.jar:/usr/lib/jvm/default/lib/javafx.fxml.jar:/usr/lib/jvm/default/lib/javafx.controls.jar:/usr/lib/jvm/default/lib/javafx-swt.jar:/usr/lib/jvm/default/lib/javafx.media.jar \
+  --add-modules=javafx.swing,javafx.graphics,javafx.fxml,javafx.media,javafx.web \
+  --add-reads javafx.graphics=ALL-UNNAMED \
+  --add-opens javafx.controls/com.sun.javafx.charts=ALL-UNNAMED \
+  --add-opens javafx.graphics/com.sun.javafx.iio=ALL-UNNAMED \
+  --add-opens javafx.graphics/com.sun.javafx.iio.common=ALL-UNNAMED \
+  --add-opens javafx.graphics/com.sun.javafx.css=ALL-UNNAMED \
+  --add-opens javafx.graphics/javafx.scene.image=ALL-UNNAMED\
+  --add-opens javafx.base/com.sun.javafx.runtime=ALL-UNNAMED \
+  -jar /usr/share/java/minion/Minion-jfx.jar