bump version and change build to match upstream

2 files changed, 16 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a60fd8ea23be..e1ae21dbd8c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = universal-gcode-sender
 	pkgdesc = Java based GRBL compatible cross-platform G-Code sender
-	pkgver = 2.0.6
+	pkgver = 2.0.7
 	pkgrel = 1
 	url = https://github.com/winder/Universal-G-Code-Sender
 	arch = any
 	license = GPL3
-	makedepends = jdk8
+	makedepends = java-environment-jdk=8
 	makedepends = npm
 	makedepends = maven
-	depends = jre8
+	depends = java-environment-jdk=8
 	depends = npm
 	provides = universal-gcode-sender
 	conflicts = universal-gcode-sender-git
-	source = https://github.com/winder/Universal-G-Code-Sender/archive/v2.0.6.tar.gz
-	md5sums = ac25e62348d9378e40487f884b770ecf
+	source = universal-gcode-sender-2.0.7.tar.gz::https://github.com/winder/Universal-G-Code-Sender/archive/v2.0.7.tar.gz
+	sha256sums = fa181573087c414fbb29cdb94dcf0a324e3d96948a1334f2e698785a69e35b02
 
 pkgname = universal-gcode-sender
 
diff --git a/PKGBUILD b/PKGBUILD
index 857fafebfc7d..f2bdeb9f88a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,30 @@
 # Maintainer: Grey Christoforo <first name at last name dot net>
 pkgname=universal-gcode-sender
-pkgver=2.0.6
+pkgver=2.0.7
 pkgrel=1
 pkgdesc="Java based GRBL compatible cross-platform G-Code sender"
 arch=(any)
 url="https://github.com/winder/Universal-G-Code-Sender"
 license=(GPL3)
-makedepends=(jdk8 npm maven)
-depends=(jre8 npm)
+makedepends=(java-environment-jdk=8 npm maven)
+depends=(java-environment-jdk=8 npm)
 provides=(universal-gcode-sender)
 conflicts=(universal-gcode-sender-git)
-source=("https://github.com/winder/Universal-G-Code-Sender/archive/v${pkgver}.tar.gz")
-md5sums=('ac25e62348d9378e40487f884b770ecf')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/winder/Universal-G-Code-Sender/archive/v${pkgver}.tar.gz")
+sha256sums=('fa181573087c414fbb29cdb94dcf0a324e3d96948a1334f2e698785a69e35b02')
 
 prepare() {
   cd "${srcdir}/Universal-G-Code-Sender-${pkgver}"
-  export MAVEN_OPTS="-Xmx2048m"
-  mvn --batch-mode validate
 }
 
 build() {
   cd "${srcdir}/Universal-G-Code-Sender-${pkgver}"
-  mvn --batch-mode package
+
+  export MAVEN_OPTS="-Xmx2048m"
+  export JAVA_HOME=/usr/lib/jvm/java-8-jdk
+  mvn test install -B -Djava.util.logging.config.file=scripts/logging.config
+  mvn package -pl ugs-classic assembly:assembly -DskipTests=true
+  mvn package -pl ugs-platform/application -P create-linux-package -DskipTests=true
 }
 
 package() {