Version bump to 0.2.30

Addition of `maven package` to the build step
as a workaround for the following issue:
https://github.com/georgewfraser/java-language-server/issues/122

Use the release tar package instead of pulling code from the git
repository.

3 files changed, 18 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94e90ebc165d..355498c9fd40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 pkgbase = java-language-server
 	pkgdesc = Java language server using the Java compiler API
-	pkgver = 0.2.24
+	pkgver = 0.2.30
 	pkgrel = 1
-	url = https://github.com/georgewfraser/java-language-server.git
+	url = https://github.com/georgewfraser/java-language-server
 	arch = any
 	license = MIT
-	makedepends = git
 	makedepends = maven
 	depends = java-runtime
 	provides = java-language-server
-	conflicts = java-language-server-git
-	source = java-language-server::git+https://github.com/georgewfraser/java-language-server.git#commit=4615ec3f224069a0c24e71afaae1b8f12c458aca
+	source = https://github.com/georgewfraser/java-language-server/archive/v0.2.30.tar.gz
 	source = launcher.sh
-	sha256sums = SKIP
-	sha256sums = 2010843d40c0612dd7884d53645435001190623c471b43a2e71d5434e9bca6e3
+	sha256sums = 90fe1ca3c6731fcda6234c36cc604e29e99ba707ccb3e2cd3aeb1c8ffa9bb9c2
+	sha256sums = 26eb4214d744c16cd4e8976e495f6cad8c7c98d4ffad3ec79b71b6241e0a1bbf
 
 pkgname = java-language-server
 
diff --git a/PKGBUILD b/PKGBUILD
index c328e7239395..048a2650bc7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,24 @@
 # Maintainer: Ricardo Grim Cabrita <grimkriegor@krutt.org>
 
 pkgname=java-language-server
-pkgver=0.2.24
-_commit=4615ec3f224069a0c24e71afaae1b8f12c458aca
+pkgver=0.2.30
 pkgrel=1
 pkgdesc="Java language server using the Java compiler API"
 arch=(any)
-url="https://github.com/georgewfraser/java-language-server.git"
+url="https://github.com/georgewfraser/java-language-server"
 license=('MIT')
-conflicts=('java-language-server-git')
 provides=('java-language-server')
 depends=('java-runtime')
-makedepends=('git' 'maven')
-source=("${pkgname}::git+${url}#commit=$_commit"
+makedepends=('maven')
+source=("${url}/archive/v${pkgver}.tar.gz"
         "launcher.sh")
-sha256sums=('SKIP'
-            '2010843d40c0612dd7884d53645435001190623c471b43a2e71d5434e9bca6e3')
+sha256sums=('90fe1ca3c6731fcda6234c36cc604e29e99ba707ccb3e2cd3aeb1c8ffa9bb9c2'
+            '26eb4214d744c16cd4e8976e495f6cad8c7c98d4ffad3ec79b71b6241e0a1bbf')
 
 build() {
-    cd "${srcdir}/${pkgname}"
-
-    # Temporary hack allowing us to link stable version 0.2.13, fixed in master
-    export JAVA_HOME="/usr/lib/jvm/default"
-    sed -i '/^JAVA_HOME=.*$/d' ./scripts/link_mac.sh ./scripts/patch_gson.sh
-
-    ./scripts/link_mac.sh
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    ./scripts/link_linux.sh
+    mvn package -DskipTests
 }
 
 package() {
@@ -32,7 +26,7 @@ package() {
       "${pkgdir}/usr/share/java" \
       "${pkgdir}/usr/bin"
     cp -r \
-      "${srcdir}/${pkgname}/dist/mac" \
+      "${srcdir}/${pkgname}-${pkgver}/dist" \
       "${pkgdir}/usr/share/java/java-language-server"
     install \
       "${srcdir}/launcher.sh" \
diff --git a/launcher.sh b/launcher.sh
index 8c58098437f1..bafd4114a410 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-
-cd /usr/share/java/java-language-server/bin
-./launcher "$@"
+set -e
+cd /usr/share/java/java-language-server/
+./lang_server_linux.sh "$@"