Update to 1.8.0 and include acx

* Java 11 is now required
* gradle 7 is now used by upstream, so use Arch's gradle package

6 files changed, 51 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b8ebedc37078..10f06d7bed48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,23 @@
 pkgbase = applecommander
 	pkgdesc = Tool that manipulates Apple ][ disk images
-	pkgver = 1.6.0
+	pkgver = 1.8.0
 	pkgrel = 1
 	url = https://applecommander.github.io/
 	arch = x86_64
 	license = GPL2
-	makedepends = archlinux-java-run
-	makedepends = java-environment<12
+	makedepends = gradle
+	makedepends = java-environment>=11
+	depends = archlinux-java-run>=7
 	depends = bash
-	depends = java-runtime
+	depends = java-runtime>=11
 	optdepends = gtk3: Graphical User Interface
-	source = https://github.com/AppleCommander/AppleCommander/archive/v1-6-0.tar.gz
-	source = applecommander.sh
+	source = https://github.com/AppleCommander/AppleCommander/archive/refs/tags/1.8.0.tar.gz
+	source = applecommander-ac.sh
+	source = applecommander-acx.sh
 	source = applecommander-gui.sh
-	sha256sums = 246cdf31812a9034d1b8f1492d48560ef65e5a2cf13ee873522ded3980c5f627
-	sha256sums = 193dc3a0f5a73a371997ff837b7222edb4d52cf22a70431dedcfd7821dbbb879
-	sha256sums = 52a269fbc7aea2f354b6a0c6d0deff8e01c41a5021cf946542cdfadd2a392ead
+	sha256sums = 66def97b3f6c3b6caf1e4a30580f81b2d44ec78781542a4c170b4cecf0e187e6
+	sha256sums = d7b1ddd2d4bf0eb5a1fd595352cd36b645f1342e1da427a01579bef779b29714
+	sha256sums = 35bfb9831c1f0411a2ea60b7f33c671dda4accbb413ac94ae8320450d9325a42
+	sha256sums = 034f41f16c0200e398c3a019359c6c30978eb857fec4e5eb97948f962e79e0dc
 
 pkgname = applecommander
-
diff --git a/PKGBUILD b/PKGBUILD
index d8cf6c5695f9..741199f4bc26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,37 +5,48 @@
 
 pkgname=applecommander
 _pkgname=AppleCommander
-pkgver=1.6.0
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="Tool that manipulates Apple ][ disk images"
 arch=(x86_64)
 url="https://applecommander.github.io/"
 license=('GPL2')
-depends=(bash java-runtime)
+depends=("archlinux-java-run>=7" bash "java-runtime>=11")
 optdepends=('gtk3: Graphical User Interface')
-makedepends=(archlinux-java-run "java-environment<12")
-source=(https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver//./-}.tar.gz
-        applecommander.sh
+makedepends=(gradle "java-environment>=11")
+source=(https://github.com/${_pkgname}/${_pkgname}/archive/refs/tags/${pkgver}.tar.gz
+        applecommander-ac.sh
+        applecommander-acx.sh
         applecommander-gui.sh)
-sha256sums=('246cdf31812a9034d1b8f1492d48560ef65e5a2cf13ee873522ded3980c5f627'
-            '193dc3a0f5a73a371997ff837b7222edb4d52cf22a70431dedcfd7821dbbb879'
-            '52a269fbc7aea2f354b6a0c6d0deff8e01c41a5021cf946542cdfadd2a392ead')
-
-# gradle 5.6.2 does not support newer JDKs
-export JAVA_HOME=$(archlinux-java-run -f jdk -b 11 -j)
+sha256sums=('66def97b3f6c3b6caf1e4a30580f81b2d44ec78781542a4c170b4cecf0e187e6'
+            'd7b1ddd2d4bf0eb5a1fd595352cd36b645f1342e1da427a01579bef779b29714'
+            '35bfb9831c1f0411a2ea60b7f33c671dda4accbb413ac94ae8320450d9325a42'
+            '034f41f16c0200e398c3a019359c6c30978eb857fec4e5eb97948f962e79e0dc')
 
 build() {
-	cd "${_pkgname}-${pkgver//./-}"
-	./gradlew --no-daemon clean assemble
+  cd "${_pkgname}-${pkgver}"
+
+  mkdir -p "${srcdir}"/gradle
+  export GRADLE_USER_HOME=${srcdir}/gradle
+
+  export JAVA_HOME=$(archlinux-java-run -a 11 -f jdk -j)
+  echo "Using JDK from $JAVA_HOME to build AppleCommander."
+
+  # ./gradlew \
+  /usr/bin/gradle \
+    --no-daemon \
+    assemble
 }
 
 package() {
-	# launch scripts
-	install -Dm 755 applecommander.sh "$pkgdir"/usr/bin/applecommander
-	install -Dm 755 applecommander-gui.sh "$pkgdir"/usr/bin/applecommander-gui
-
-	# jar files
-	cd "${_pkgname}-${pkgver//./-}"/build/libs
-	install -Dm 644 ${_pkgname}-${pkgver//./-}-ac-${pkgver}.jar "$pkgdir"/usr/share/java/$pkgname/${_pkgname}-ac.jar
-	install -Dm 644 ${_pkgname}-${pkgver//./-}-linux64-gtk-${pkgver}.jar "$pkgdir"/usr/share/java/$pkgname/${_pkgname}-linux64-gtk.jar
+  # launch scripts
+  install -Dm 755 applecommander-ac.sh "$pkgdir"/usr/bin/applecommander-ac
+  install -Dm 755 applecommander-acx.sh "$pkgdir"/usr/bin/applecommander-acx
+  install -Dm 755 applecommander-gui.sh "$pkgdir"/usr/bin/applecommander-gui
+
+  # jar files
+  cd "${_pkgname}-${pkgver}"/app
+  install -Dm 644 cli-ac/build/libs/${_pkgname}-ac-${pkgver}.jar "$pkgdir"/usr/share/java/$pkgname/${_pkgname}-ac.jar
+  install -Dm 644 cli-acx/build/libs/${_pkgname}-acx-${pkgver}.jar "$pkgdir"/usr/share/java/$pkgname/${_pkgname}-acx.jar
+  install -Dm 644 gui-swt-linux-x86_64/build/libs/${_pkgname}-linux-x86_64-${pkgver}.jar "$pkgdir"/usr/share/java/$pkgname/${_pkgname}-gtk.jar
 }
diff --git a/applecommander-ac.sh b/applecommander-ac.sh
new file mode 100755
index 000000000000..984df71fec82
--- /dev/null
+++ b/applecommander-ac.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/archlinux-java-run -a 11 -- -jar /usr/share/java/applecommander/AppleCommander-ac.jar "$@"
diff --git a/applecommander-acx.sh b/applecommander-acx.sh
new file mode 100755
index 000000000000..f41588398f5f
--- /dev/null
+++ b/applecommander-acx.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/archlinux-java-run -a 11 -- -jar /usr/share/java/applecommander/AppleCommander-acx.jar "$@"
diff --git a/applecommander-gui.sh b/applecommander-gui.sh
index d7d2ce133a0c..34e915101d65 100755
--- a/applecommander-gui.sh
+++ b/applecommander-gui.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/bin/java -jar /usr/share/java/applecommander/AppleCommander-linux64-gtk.jar "$@"
+/usr/bin/java -jar /usr/share/java/applecommander/AppleCommander-gtk.jar "$@"
diff --git a/applecommander.sh b/applecommander.sh
deleted file mode 100755
index cd42999ee974..000000000000
--- a/applecommander.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/bin/java -jar /usr/share/java/applecommander/AppleCommander-ac.jar "$@"