From eb1260b0d446d7afd47d0dbc345bb2b8a21335fe Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Thu, 8 Sep 2016 15:31:12 +0100
Subject: Bump sbt.version to 0.13.12, without breaking

---
 build.sbt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'build.sbt')

diff --git a/build.sbt b/build.sbt
index 1105902a9d..557d4e80e8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -109,6 +109,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,
-- 
cgit v1.2.3