luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Dotty handling in scalaInstance 

sbt-dotty 0.3.0 (https://github.com/lampepfl/dotty/pull/5835) sets
`managedScalaInstance := false` and does everything by itself, so this
isn't needed anymore.
This commit is contained in:
Guillaume Martres 2019-02-12 21:45:25 +01:00
parent 8df2807cd1
commit 85f91e76ca
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/scala/sbt/Defaults.scala
View File

@ -737,10 +737,7 @@ object Defaults extends BuildCommon {
val allJars = toolReport.modules.flatMap(_.artifacts.map(_._2)) val allJars = toolReport.modules.flatMap(_.artifacts.map(_._2))
val libraryJar = file(ScalaArtifacts.LibraryID) val libraryJar = file(ScalaArtifacts.LibraryID)
val binVersion = scalaBinaryVersion.value val binVersion = scalaBinaryVersion.value
val compilerJar = val compilerJar = file(ScalaArtifacts.CompilerID)
if (ScalaInstance.isDotty(scalaVersion.value))
file(ScalaArtifacts.dottyID(binVersion))
else file(ScalaArtifacts.CompilerID)
new ScalaInstance( new ScalaInstance(
scalaVersion.value, scalaVersion.value,
makeClassLoader(state.value)(allJars.toList), makeClassLoader(state.value)(allJars.toList),