Skip to content

Commit 8e7c3b7

Browse files
committed
update sbt script
1 parent c33358d commit 8e7c3b7

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

sbt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Author: Paul Phillips <[email protected]>
55

66
# todo - make this dynamic
7-
declare -r sbt_release_version=0.12.2-RC2
7+
declare -r sbt_release_version=0.12.2
88
declare -r sbt_snapshot_version=0.13.0-SNAPSHOT
99

1010
unset sbt_jar sbt_dir sbt_create sbt_snapshot sbt_launch_dir
@@ -13,8 +13,8 @@ unset verbose debug quiet noshare trace_level log_level
1313

1414
for arg in "$@"; do
1515
case $arg in
16-
-q|-quiet) quiet=1 ;;
17-
*) ;;
16+
-q|-quiet) quiet=true ;;
17+
*) ;;
1818
esac
1919
done
2020

@@ -57,7 +57,7 @@ sbt_version () {
5757
}
5858

5959
echoerr () {
60-
[[ -z $quiet ]] && echo 1>&2 "$@"
60+
[[ -z $quiet ]] && echo "$@" >&2
6161
}
6262
vlog () {
6363
[[ $verbose || $debug ]] && echoerr "$@"
@@ -106,7 +106,7 @@ make_url () {
106106
}
107107

108108
declare -r default_jvm_opts="-Dfile.encoding=UTF8"
109-
declare -r default_sbt_opts="-XX:+CMSClassUnloadingEnabled"
109+
declare -r default_sbt_opts="-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC"
110110
declare -r default_sbt_mem=1536
111111
declare -r default_trace_level=15
112112
declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
@@ -127,7 +127,6 @@ declare sbt_universal_launcher="$script_dir/lib/sbt-launch.jar"
127127
declare sbt_mem=$default_sbt_mem
128128
declare sbt_jar=$sbt_universal_launcher
129129
declare trace_level=$default_trace_level
130-
declare log_level=Info
131130

132131
# pull -J and -D options to give to java.
133132
declare -a residual_args
@@ -341,15 +340,15 @@ process_args ()
341340
while [[ $# -gt 0 ]]; do
342341
case "$1" in
343342
-h|-help) usage; exit 1 ;;
344-
-v|-verbose) verbose=1 && shift ;;
345-
-d|-debug) debug=1 && log_level=Debug && shift ;;
346-
-q|-quiet) quiet=1 && log_level=Error && shift ;;
343+
-v|-verbose) verbose=true && log_level=Info && shift ;;
344+
-d|-debug) debug=true && log_level=Debug && shift ;;
345+
-q|-quiet) quiet=true && log_level=Error && shift ;;
347346

348347
-trace) require_arg integer "$1" "$2" && trace_level=$2 && shift 2 ;;
349348
-ivy) require_arg path "$1" "$2" && addJava "-Dsbt.ivy.home=$2" && shift 2 ;;
350349
-mem) require_arg integer "$1" "$2" && sbt_mem="$2" && shift 2 ;;
351350
-no-colors) addJava "-Dsbt.log.noformat=true" && shift ;;
352-
-no-share) noshare=1 && shift ;;
351+
-no-share) noshare=true && shift ;;
353352
-sbt-boot) require_arg path "$1" "$2" && addJava "-Dsbt.boot.directory=$2" && shift 2 ;;
354353
-sbt-dir) require_arg path "$1" "$2" && sbt_dir="$2" && shift 2 ;;
355354
-debug-inc) addJava "-Dxsbt.inc.debug=true" && shift ;;
@@ -451,13 +450,14 @@ fi
451450

452451
# -shell \
453452
# "set every traceLevel := $trace_level" \
453+
[[ -n $log_level ]] && logLevalArg="set logLevel in Global := Level.$log_level"
454454

455455
# run sbt
456456
execRunner "$java_cmd" \
457457
$(get_mem_opts $sbt_mem) \
458458
$(get_jvm_opts) \
459459
${java_args[@]} \
460460
-jar "$sbt_jar" \
461-
"set logLevel in Global := Level.$log_level" \
461+
"$logLevalArg" \
462462
"${sbt_commands[@]}" \
463463
"${residual_args[@]}"

0 commit comments

Comments
 (0)