JRomManager 3.0.0 beta 5

2 files changed, 14 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 01e99e61c070..57969fcf6d78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = jrommanager
 	pkgdesc = A Rom Manager entirely written in Java and released under GPL v2
-	pkgver = 2.5.1
+	pkgver = 3.0.0
 	pkgrel = 1
 	url = https://github.com/optyfr/JRomManager
 	arch = any
 	license = GPL2
-	makedepends = java-environment=11
+	makedepends = java-environment=17
 	makedepends = git
-	depends = java-runtime>=11
 	options = !strip
-	source = git+https://github.com/optyfr/JRomManager#tag=2.5.1
+	source = git+https://github.com/optyfr/JRomManager#tag=3.0.0-beta.5
 	source = JRomManager.desktop
 	source = JRomManager.png
 	source = JRomManager.sh
 	sha256sums = SKIP
 	sha256sums = 070fc15f00ba27398e049f7c5753588a9907e3d92e5cbd8158ee66bff3ff7b0d
 	sha256sums = 247df543bd5d6f711952bf2903b074ed89f9b1df2fa4ec318b3e61ad270ae3b5
-	sha256sums = 3395aa7b9c51f15d81e4f3795536b45434ace01ba17b60c5207f71ab0436f413
+	sha256sums = 0245784a0bbf07d9190108282a091564f1aa7dfbdffb8d3b8282760e833d2356
 
 pkgname = jrommanager
diff --git a/PKGBUILD b/PKGBUILD
index e99c9226ceb9..915608ccbf93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,23 +4,19 @@
 
 pkgname=jrommanager
 _gitname=JRomManager
-pkgver=2.5.1
+_gitver=3.0.0-beta.5
+pkgver=3.0.0
 pkgrel=1
 pkgdesc='A Rom Manager entirely written in Java and released under GPL v2'
 arch=('any')
 license=('GPL2')
 url="https://github.com/optyfr/JRomManager"
-depends=('java-runtime>=11')
-makedepends=('java-environment=11' 'git')
+makedepends=('java-environment=17' 'git')
 options=(!strip)
-source=("git+https://github.com/optyfr/${_gitname}#tag=${pkgver}"
+source=("git+https://github.com/optyfr/${_gitname}#tag=${_gitver}"
   "${_gitname}.desktop" 
   "${_gitname}.png"
   "${_gitname}.sh")
-sha256sums=('SKIP'
-            '070fc15f00ba27398e049f7c5753588a9907e3d92e5cbd8158ee66bff3ff7b0d'
-            '247df543bd5d6f711952bf2903b074ed89f9b1df2fa4ec318b3e61ad270ae3b5'
-            '3395aa7b9c51f15d81e4f3795536b45434ace01ba17b60c5207f71ab0436f413')
 
 prepare() {
   cd $srcdir/$_gitname
@@ -29,27 +25,21 @@ prepare() {
 
 build() {
   cd $srcdir/$_gitname
-  LC_ALL="$(localectl list-locales | grep -1 utf8)" JAVA_HOME=/usr/lib/jvm/java-11-openjdk sh ./gradlew build
+  LC_ALL="$(localectl list-locales | grep -1 utf8)" JAVA_HOME=/usr/lib/jvm/java-17-openjdk sh ./gradlew jlink -xtest
 }
 
 package() {
-  cd $srcdir/$_gitname/$_gitname/build/distributions
+  cd $srcdir/$_gitname/build/image/JRomManager-linux-x64
 
-  mkdir -p $_gitname-ext
-  bsdtar -xf $_gitname-$pkgver.zip -C $_gitname-ext
-  cd $_gitname-ext
+  mkdir -p "$pkgdir/usr/share/java/$pkgname/"
+  cp -dr --preserve=mode {bin,conf,legal,lib} "$pkgdir/usr/share/java/$pkgname/"
 
-  mkdir -p "$pkgdir/usr/share/java/$pkgname/lib/"
-  install -Dm755 *.sh "$pkgdir/usr/share/java/$pkgname/"
-  install -Dm644 *.jar "$pkgdir/usr/share/java/$pkgname/"
-  install -Dm644 lib/*.jar "$pkgdir/usr/share/java/$pkgname/lib/"
-  cp -dr --preserve=mode {certs,webclient,wrapper} "$pkgdir/usr/share/java/$pkgname/"
   install -Dm755 $srcdir/$_gitname.sh "$pkgdir/usr/bin/$pkgname"
-
   install -Dm644 $srcdir/$_gitname.desktop "$pkgdir/usr/share/applications/$_gitname.desktop"
   install -Dm644 $srcdir/$_gitname.png "$pkgdir/usr/share/pixmaps/$_gitname.png"
 }
+
 sha256sums=('SKIP'
             '070fc15f00ba27398e049f7c5753588a9907e3d92e5cbd8158ee66bff3ff7b0d'
             '247df543bd5d6f711952bf2903b074ed89f9b1df2fa4ec318b3e61ad270ae3b5'
-            '3395aa7b9c51f15d81e4f3795536b45434ace01ba17b60c5207f71ab0436f413')
+            '0245784a0bbf07d9190108282a091564f1aa7dfbdffb8d3b8282760e833d2356')