diff --git a/files/sbt.sh b/files/sbt.sh --- a/files/sbt.sh +++ b/files/sbt.sh @@ -1,5 +1,11 @@ #!/bin/bash + if [[ -z "${SBT_OPTS}" ]]; then SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled" fi -/usr/lib64/openjdk-8/bin/java $SBT_OPTS -jar /usr/share/sbt/sbt.jar "$@" + +if [ -z "$JAVA_HOME" ]; then + export JAVA_HOME=/usr/lib64/openjdk-11 +fi + +exec $JAVA_HOME/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,25 +1,25 @@ name : sbt -version : 1.3.10 -release : 7 +version : 1.3.12 +release : 8 source : # sbt expects a git repository in order to be built. - - git|https://github.com/sbt/sbt.git : v1.3.10 + - git|https://github.com/sbt/sbt.git : v1.3.12 license : Apache-2.0 component : programming.tools summary : Build tool for Scala, Java, and more description: | sbt is a build tool for Scala, Java, and more. builddeps : - - openjdk-8 # Can be removed on the next release. + - openjdk-11 # Can be removed on the next release. - sbt rundeps : - - openjdk-8 + - openjdk-11 networking : yes setup : | sed -e 's|-SNAPSHOT||g' -i build.sbt build : | # Can be removed on the next release. - export PATH="$PATH:/usr/lib64/openjdk-8/bin" + export PATH="$PATH:/usr/lib64/openjdk-11/bin" sbt -Divy.home=$workdir/.ivy2 \ -Dsbt.boot.lock=false \ diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ sbt - Bryan T. Meyers - bmeyers@datadrake.com + Campbell Jones + dev@serebit.com Apache-2.0 programming.tools @@ -24,12 +24,12 @@ - - 2020-06-02 - 1.3.10 + + 2020-06-06 + 1.3.12 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + Campbell Jones + dev@serebit.com \ No newline at end of file