Update to 2.80dev

3 files changed, 15 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3cd23c5e68a..0099e706b1b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = jabref-git
 	pkgdesc = GUI frontend for BibTeX, written in Java -- built from git
-	pkgver = 2.11b3.251.g9b010a4
+	pkgver = 2.11b3.635.gf69e933
 	pkgrel = 1
 	url = http://jabref.sourceforge.net/
 	arch = any
 	license = GPL
 	makedepends = git
-	depends = java-environment
-	depends = sh
+	depends = java-environment=8
 	provides = jabref
 	conflicts = jabref
 	source = jabref::git+https://github.com/JabRef/jabref.git
@@ -16,7 +15,7 @@ pkgbase = jabref-git
 	source = crystal_16.tar.gz
 	md5sums = SKIP
 	md5sums = 5f76feb6b2f66a2ea8b52bca999a934f
-	md5sums = 9da2f8a5010e25bb04c81225309cc9e5
+	md5sums = 6d4ef1d79495d2e09e4c616c9227b0cb
 	md5sums = b03d877ebe4312b6c05dbe4a27d13001
 
 pkgname = jabref-git
diff --git a/PKGBUILD b/PKGBUILD
index f9ca62a9be6b..5e5157f4c519 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,15 @@
 _numixicons=
 
 pkgname=jabref-git
-pkgver=2.11b3.251.g9b010a4
-_pkgver=2.11dev
+pkgver=2.11b3.635.gf69e933
+_pkgver=2.80dev
 _gitname="jabref"
 pkgrel=1
 pkgdesc="GUI frontend for BibTeX, written in Java -- built from git"
 arch=('any')
 url="http://jabref.sourceforge.net/"
 license=('GPL')
-depends=('java-environment' 'sh')
+depends=('java-environment=8')
 makedepends=('git')
 provides=('jabref')
 conflicts=('jabref')
@@ -23,7 +23,7 @@ source=('jabref::git+https://github.com/JabRef/jabref.git'
         'crystal_16.tar.gz')
 md5sums=('SKIP'
          '5f76feb6b2f66a2ea8b52bca999a934f'
-         '9da2f8a5010e25bb04c81225309cc9e5'
+         '6d4ef1d79495d2e09e4c616c9227b0cb'
          'b03d877ebe4312b6c05dbe4a27d13001')
 
 pkgver() {
@@ -40,19 +40,21 @@ prepare(){
 }
 
 build() {
+  JAVA_HOME=/usr/lib/jvm/java-8-openjdk
+  PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
   cd "$srcdir/$_gitname"
-  ./gradlew antTargets.addgitinfo generateSource antTargets.jars
+  ./gradlew releaseJar
 }
 
 package() {
   cd "$srcdir/$_gitname"
-  install -Dm644 buildant/lib/JabRef-*.jar \
+  install -Dm644 build/releases/JabRef-$_pkgver.jar \
     ${pkgdir}/usr/share/java/JabRef.jar 
   install -Dm755 $srcdir/jabref.sh ${pkgdir}/usr/bin/jabref
   install -Dm644 $srcdir/jabref.desktop \
     ${pkgdir}/usr/share/applications/jabref.desktop
-  install -Dm644 buildant/images/JabRef-icon-48.png \
+  install -Dm644 build/resources/main/images/icons/JabRef-icon-48.png \
     ${pkgdir}/usr/share/pixmaps/jabref.png
   install -d ${pkgdir}/usr/share/doc/$pkgname
-  cp -r buildant/help ${pkgdir}/usr/share/doc/$pkgname
+  cp -r build/resources/main/help ${pkgdir}/usr/share/doc/$pkgname
 }
diff --git a/jabref.sh b/jabref.sh
index 0d983e2800b9..69ca53f6f92b 100644
--- a/jabref.sh
+++ b/jabref.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 cd /usr/share/java
-${JAVA_HOME}/bin/java -jar JabRef.jar
+JAVA_HOME='/usr/lib/jvm/java-8-openjdk' 
+PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH java -jar JabRef.jar