Permalink
Browse files

Update SBT to v1.0.4

Also, remove the stty hack.
  • Loading branch information...
elibarzilay committed Dec 12, 2017
1 parent b73e43e commit 8d20dab2b398ca09eea9bca54bf603f30c2c0c93
Showing with 4 additions and 12 deletions.
  1. +2 −2 tools/config.sh
  2. +2 −10 tools/runme/build.sh
View
@@ -69,9 +69,9 @@ INSTALLATIONS=(
vers: "java -version|openjdk version \"<{ver}>_*\""
where: "devel runtime build"
SBT ver: "1.0.0"
SBT ver: "1.0.4"
url: "https://github.com/sbt/sbt/releases/download/v<{ver}>/sbt-<{ver}>.tgz"
sha256: "9ae04f4972145f2ac56c4deb868c9a5bb8b8b85c5151885dff3b997712645c5a"
sha256: "813776f81b1dfa990fba11cd6d0120df3467bee00742b115f282a0e8e254e23f"
exes: "sbt"
vers: "sbt -no-colors sbtVersion|?info? <{ver}>"
where: "devel build"
View
@@ -81,17 +81,9 @@ _sbt_run() { # sbt-args...
fi
local flags=""; if [[ "$BUILDMODE" = "server" ]]; then flags="-no-colors"; fi
# temporary hack around the sbt+bash problem in v1.0.0,
# (should be fixed in 1.0.3, and then this should be removed)
local stty_settings=""
if [[ "$SBT_VERSION" > "1.0.2" ]]; then failwith "Time to remove the stty workaround"
elif [[ "$BUILDMODE" != "server" ]]; then stty_settings="$(stty -g)"
fi
(set -o pipefail; export BUILD_ARTIFACTS TEST_RESULTS
_ sbt $flags "$@" < /dev/null 2>&1 | _postprocess_sbt_log)
local ret=$?
if [[ -n "$stty_settings" ]]; then stty "$stty_settings"; fi
if ((ret != 0)); then exit $ret; fi
_ sbt $flags "$@" < /dev/null 2>&1 | _postprocess_sbt_log) \
|| exit $?
}
_sbt_build() {

0 comments on commit 8d20dab

Please sign in to comment.