diff options
| author | Seth Tisue <seth@tisue.net> | 2016-10-18 10:24:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-18 10:24:13 -0700 |
| commit | 7ef557539ddf9cdc0959a374f95254eda21731e7 (patch) | |
| tree | f564c7fbc5ed4a06cfdf3552c812649f9614f099 /build.sbt | |
| parent | 114dad8848ad97cd343f10acdac7bccd888a1576 (diff) | |
| parent | eb1260b0d446d7afd47d0dbc345bb2b8a21335fe (diff) | |
| download | scala-7ef557539ddf9cdc0959a374f95254eda21731e7.tar.gz scala-7ef557539ddf9cdc0959a374f95254eda21731e7.tar.bz2 scala-7ef557539ddf9cdc0959a374f95254eda21731e7.zip | |
Merge pull request #5386 from dwijnand/sbt-0.13.12
Bump sbt.version to 0.13.12, without breaking
Diffstat (limited to 'build.sbt')
| -rw-r--r-- | build.sbt | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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, |