v1.2.20 and architecture specific builds

2 files changed, 21 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 871850f01395..ffd19f4a3838 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = briar-headless
 	pkgdesc = Briar REST API
-	pkgver = 1.2.11
+	pkgver = 1.2.20
 	pkgrel = 1
 	url = https://code.briarproject.org/briar/briar
-	arch = any
+	arch = x86_64
+	arch = armv7h
+	arch = aarch64
 	license = GPL
 	makedepends = git
 	makedepends = jdk11-openjdk
 	depends = java-runtime=11
 	depends = bash
 	conflicts = briar-headless-git
-	source = briar-headless::git+https://code.briarproject.org/briar/briar.git#tag=release-1.2.11
+	source = briar-headless::git+https://code.briarproject.org/briar/briar.git#tag=release-1.2.20
 	sha256sums = SKIP
 
 pkgname = briar-headless
diff --git a/PKGBUILD b/PKGBUILD
index 50e83ffe1eee..f4e4467210a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 pkgname=briar-headless
 conflicts=('briar-headless-git')
-pkgver=1.2.11
+pkgver=1.2.20
 pkgrel=1
 pkgdesc='Briar REST API'
-arch=(any)
+arch=('x86_64' 'armv7h' 'aarch64')
 url="https://code.briarproject.org/briar/briar"
 license=('GPL')
 depends=('java-runtime=11' 'bash')
@@ -11,16 +11,27 @@ makedepends=('git' 'jdk11-openjdk')
 source=("${pkgname}::git+https://code.briarproject.org/briar/briar.git#tag=release-${pkgver}")
 sha256sums=('SKIP')
 
+case "$CARCH" in
+  armv7h)
+    _gradle_arch='armhf'
+  ;;
+  aarch64)
+    _gradle_arch='aarch64'
+  ;;
+  *)
+    _gradle_arch='x86'
+  ;;
+esac
+
 build() {
   cd "${pkgname}"
   export PATH="/usr/lib/jvm/java-11-openjdk/jre/bin/:$PATH"
   export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
- ./gradlew --configure-on-demand briar-headless:jar
+ ./gradlew --configure-on-demand briar-headless:${_gradle_arch}LinuxJar
 }
 
 package() {
   cd "${pkgname}/${pkgname}"
-  # depends+=("java-runtime")
   install -dm755 "$pkgdir/usr/bin/"
   cat << EOF > "$pkgdir/usr/bin/$pkgname"
 #!/bin/sh
@@ -28,5 +39,5 @@ exec /usr/bin/java -jar '/usr/share/java/briar-headless.jar' "$@"
 EOF
   chmod +x "$pkgdir/usr/bin/$pkgname"
 
-  install -m 644 -D "build/libs/$pkgname.jar" "$pkgdir/usr/share/java/$pkgname.jar"
+  install -m 644 -D "build/libs/${pkgname}-linux-${CARCH}.jar" "$pkgdir/usr/share/java/${pkgname}.jar"
 }