diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-14 11:42:00 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-14 11:42:00 -0700 |
| commit | 6f6fdeaea946e2cfec66bd73468a31d208b6f373 (patch) | |
| tree | dcc6577e82f8d074c4c3d3f936a3f0d3f90801f6 /scripts | |
| parent | 66588a78f22aa3595df9938449268e432f27e3ff (diff) | |
| parent | 8821a9f68ccb452659714546208d8802675b23dd (diff) | |
| download | scala-6f6fdeaea946e2cfec66bd73468a31d208b6f373.tar.gz scala-6f6fdeaea946e2cfec66bd73468a31d208b6f373.tar.bz2 scala-6f6fdeaea946e2cfec66bd73468a31d208b6f373.zip | |
Merge commit 2.11.x into 2.12.x.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/common | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/common b/scripts/common index 35199992bc..bfddf3d149 100644 --- a/scripts/common +++ b/scripts/common @@ -19,7 +19,7 @@ mkdir -p $IVY_CACHE rm -rf $IVY_CACHE/cache/org.scala-lang SBT_CMD=${sbtCmd-sbt} -SBT_CMD="$SBT_CMD -sbt-version 0.13.9" +SBT_CMD="$SBT_CMD -sbt-version 0.13.11" # temp dir where all 'non-build' operation are performed TMP_ROOT_DIR=$(mktemp -d -t pr-scala.XXXX) |