aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Robinson <edward-robinson@cookpad.com>2018-01-22 14:16:46 +0000
committerTimo Teräs <timo.teras@iki.fi>2018-02-06 16:43:10 +0000
commit8a00e9f5dcc3247c5297157928576f89a8d4f26a (patch)
treef6ce5bf28e6be45bbdfe60cbc3bea07cadb87daf
parentf98131a7c7f0fdb92a9eaf11d71c21642e0531ff (diff)
downloadaports-8a00e9f5dcc3247c5297157928576f89a8d4f26a.tar.bz2
aports-8a00e9f5dcc3247c5297157928576f89a8d4f26a.tar.xz
testing/sbt: update to 1.1.0
-rw-r--r--testing/sbt/APKBUILD14
-rw-r--r--testing/sbt/global-sbtopts.patch12
2 files changed, 6 insertions, 20 deletions
diff --git a/testing/sbt/APKBUILD b/testing/sbt/APKBUILD
index 8e795ff315..04acc24e4e 100644
--- a/testing/sbt/APKBUILD
+++ b/testing/sbt/APKBUILD
@@ -1,16 +1,15 @@
-# Contributor: Ed Robinson <ed@reevoo.com>
-# Maintainer: Ed Robinson <ed@reevoo.com>
+# Contributor: Ed Robinson <edward-robinson@cookpad.com>
+# Maintainer: Ed Robinson <edward-robinson@cookpad.com>
pkgname=sbt
-pkgver=0.13.15
+pkgver=1.1.0
pkgrel=0
pkgdesc="The interactive build tool, sbt is a build tool for Scala, Java, and more."
url="http://www.scala-sbt.org/"
arch="noarch"
license="BSD-3-Clause"
+options="!check"
depends="openjdk8-jre bash"
-source="https://dl.bintray.com/$pkgname/native-packages/$pkgname/$pkgver/$pkgname-$pkgver.tgz
-global-sbtopts.patch"
-
+source="https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tgz"
builddir="$srcdir/$pkgname"
_basedir="/usr/share/java/$pkgname"
@@ -32,5 +31,4 @@ package() {
rm $destdir/bin/sbt.bat
rm $confdir/sbtconfig.txt
}
-sha512sums="9e8a4f92970b96ddb93c0f6d9bfb394bc10648511e65d2f3e7637c580877c91acfa0e5f73fc11b9992dab6b5c142ead314609f47c2aac3eb6da11d879f3da8a8 sbt-0.13.15.tgz
-a7f4eedf389024d6c10a523a3456f57dd901b43b9234e12e35c4131a13a95ceac9fe3614b0266193f8700712c26ca45554444d9dd2433ed79069ae2b5ee1d58e global-sbtopts.patch"
+sha512sums="405c76991fb9940e7240194d778ccdff0a85690e9066a0f0c11b28e42f16d3d6ee1d63a2f6641d908c955c510f0a9c0975ed157c5fd22a07f1c132b1d272c95d sbt-1.1.0.tgz"
diff --git a/testing/sbt/global-sbtopts.patch b/testing/sbt/global-sbtopts.patch
deleted file mode 100644
index c3ad414a80..0000000000
--- a/testing/sbt/global-sbtopts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp sbt-launcher-packaging-0.13.13/bin/sbt patched/bin/sbt
---- sbt-launcher-packaging-0.13.13/bin/sbt 2016-10-28 18:46:00.000000000 +0100
-+++ patched/bin/sbt 2017-02-17 11:11:51.000000000 +0000
-@@ -62,7 +62,7 @@ cygwinpath() {
-
- declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
- declare -r sbt_opts_file=".sbtopts"
--declare -r etc_sbt_opts_file="${sbt_home}/conf/sbtopts"
-+declare -r etc_sbt_opts_file="/etc/sbt/sbtopts"
- declare -r win_sbt_opts_file="${sbt_home}/conf/sbtconfig.txt"
-
- usage() {