diff options
| author | Seth Tisue <seth@tisue.net> | 2016-10-19 19:54:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 19:54:12 -0700 |
| commit | f66ed4d4f798fa693f87702769252ddfc6b81cf3 (patch) | |
| tree | 50b7522d8a3b615b34376fe91ad78f0e9e1a9d7b | |
| parent | 54cf7313e6bd16bddcba2052d0b4277ead308abd (diff) | |
| parent | 31a99971dbbbc3801d173fb329f9ba7ccf1d78f4 (diff) | |
| download | scala-f66ed4d4f798fa693f87702769252ddfc6b81cf3.tar.gz scala-f66ed4d4f798fa693f87702769252ddfc6b81cf3.tar.bz2 scala-f66ed4d4f798fa693f87702769252ddfc6b81cf3.zip | |
Merge pull request #5464 from retronym/backport/5386
[backport] Bump sbt.version to 0.13.12, without breaking
| -rw-r--r-- | build.sbt | 5 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | scripts/common | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -136,6 +136,11 @@ lazy val commonSettings = clearSourceAndResourceDirectories ++ publishSettings + } }, scalaVersion := (scalaVersion in bootstrap).value, + // As of sbt 0.13.12 (sbt/sbt#2634) sbt endeavours to align both scalaOrganization and scalaVersion + // in the Scala artefacts, for example scala-library and scala-compiler. + // This doesn't work in the scala/scala build because the version of scala-library and the scalaVersion of + // scala-library are correct to be different. So disable overriding. + ivyScala ~= (_ map (_ copy (overrideScalaVersion = false))), // we always assume that Java classes are standalone and do not have any dependency // on Scala classes compileOrder := CompileOrder.JavaThenScala, diff --git a/project/build.properties b/project/build.properties index 43b8278c68..35c88bab7d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.11 +sbt.version=0.13.12 diff --git a/scripts/common b/scripts/common index bfddf3d149..f2202b9165 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.11" +SBT_CMD="$SBT_CMD -sbt-version 0.13.12" # temp dir where all 'non-build' operation are performed TMP_ROOT_DIR=$(mktemp -d -t pr-scala.XXXX) |