summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD11
2 files changed, 10 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c2d3da0dc3c5..1be0fd2f674a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
pkgbase = dex2jar-git
pkgdesc = Tools to work with android .dex and java .class files, git version
- pkgver = 2.1.nightly.28.r13.gd7a86110
- pkgrel = 1
+ pkgver = 2.1.nightly.28.r13.gd7a8611
+ pkgrel = 3
url = https://github.com/pxb1988/dex2jar
arch = i686
arch = x86_64
license = Apache-2.0
- makedepends = java-environment>=7
+ makedepends = jdk8-openjdk
makedepends = git
makedepends = gradle
depends = java-runtime
- provides = dex2jar=2.1.nightly.28.r13.gd7a86110
+ provides = dex2jar=2.1.nightly.28.r13.gd7a8611
conflicts = dex2jar
source = dex2jar::git+https://github.com/pxb1988/dex2jar
md5sums = SKIP
pkgname = dex2jar-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 2dab4958b912..a1fc618574b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Haruue Icymoon <haruue@caoyue.com.cn>
pkgname=dex2jar-git
-pkgver=2.1.nightly.28.r13.gd7a86110
-pkgrel=1
+pkgver=2.1.nightly.28.r13.gd7a8611
+pkgrel=3
pkgdesc='Tools to work with android .dex and java .class files, git version'
arch=('i686' 'x86_64')
url='https://github.com/pxb1988/dex2jar'
@@ -11,18 +11,19 @@ conflicts=("${pkgname%-git}")
provides=("${pkgname%-git}=$pkgver")
license=('Apache-2.0')
depends=('java-runtime')
-makedepends=('java-environment>=7' 'git' 'gradle')
+makedepends=('jdk8-openjdk' 'git' 'gradle')
source=("${pkgname%-git}"::'git+https://github.com/pxb1988/dex2jar')
md5sums=('SKIP')
pkgver() {
cd "$srcdir/${pkgname%-git}"
- git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+ git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
cd "$srcdir/${pkgname%-git}"
- gradle clean installDist
+ export JAVA_HOME="/usr/lib/jvm/java-8-openjdk"
+ ./gradlew clean installDist
}
package() {