diff --git a/files/sbt.sh b/files/sbt.sh --- a/files/sbt.sh +++ b/files/sbt.sh @@ -2,4 +2,4 @@ if [[ -z "${SBT_OPTS}" ]]; then SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled" fi -java $SBT_OPTS -jar /usr/share/sbt/sbt-launch.jar "$@" +/usr/lib64/openjdk-8/bin/java $SBT_OPTS -jar /usr/share/sbt/sbt.jar "$@" diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,22 +1,31 @@ name : sbt -version : 1.0.2 -release : 5 +version : 1.3.10 +release : 6 source : - - https://github.com/sbt/sbt/archive/v1.0.2.tar.gz : 175effc72923cc8bd58c7086c44d97c8c4fa272fec1551603e1ef4a07b1db033 -license : BSD-3-Clause + # sbt expects a git repository in order to be built. + - git|https://github.com/sbt/sbt.git : v1.3.10 +license : Apache-2.0 component : programming.tools -summary : sbt is a build tool for Scala, Java, and more. +summary : Build tool for Scala, Java, and more description: | sbt is a build tool for Scala, Java, and more. builddeps : - - openjdk-8 + - openjdk-8 # Can be removed on the next release. - sbt +rundeps : + - openjdk-8 networking : yes +setup : | + sed -e 's|-SNAPSHOT||g' -i build.sbt build : | - sed -i -e 's/-SNAPSHOT//g' build.sbt - sbt -Dsbt.global.base=./.sbt/ -Dsbt.ivy.home=./.ivy2/ -Divy.home=./.ivy2/ package + # Can be removed on the next release. + export PATH="$PATH:/usr/lib64/openjdk-8/bin" + + sbt -Divy.home=$workdir/.ivy2 \ + -Dsbt.global.base=$workdir/.sbt \ + -Dsbt.ivy.home=$workdir/.ivy2 \ + -Duser.home=$workdir/.java \ + package install : | - install -D -m 00755 $pkgfiles/sbt.sh $installdir/usr/share/sbt/sbt.sh - install -D -m 00644 launch/target/sbt-launch.jar $installdir/usr/share/sbt/sbt-launch.jar - install -d $installdir/usr/bin - ln -s /usr/share/sbt/sbt.sh $installdir/usr/bin/sbt + install -Dm00755 $pkgfiles/sbt.sh $installdir/usr/bin/sbt + install -Dm00644 launch/target/sbt-launch.jar $installdir/usr/share/sbt/sbt.jar diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,34 +2,34 @@ sbt - René Vangsgaard - rene.vangsgaard@gmail.com + Fabio Forni + livingsilver94.solus@redaril.me - BSD-3-Clause + Apache-2.0 programming.tools - sbt is a build tool for Scala, Java, and more. + Build tool for Scala, Java, and more sbt is a build tool for Scala, Java, and more. - https://solus-project.com/sources/README.Solus + https://getsol.us/sources/README.Solus sbt - sbt is a build tool for Scala, Java, and more. + Build tool for Scala, Java, and more sbt is a build tool for Scala, Java, and more. programming.tools - /usr/bin - /usr/share/sbt + /usr/bin/sbt + /usr/share/sbt/sbt.jar - - 2017-09-24 - 1.0.2 + + 2020-05-24 + 1.3.10 Packaging update - René Vangsgaard - rene.vangsgaard@gmail.com + Fabio Forni + livingsilver94.solus@redaril.me \ No newline at end of file