From 85f91e76cac7d2c775a9f5b5059587cf6eb2fd04 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Tue, 12 Feb 2019 21:45:25 +0100 Subject: [PATCH] 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. --- main/src/main/scala/sbt/Defaults.scala | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 907aad87b..9d68cf76d 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -737,10 +737,7 @@ object Defaults extends BuildCommon { val allJars = toolReport.modules.flatMap(_.artifacts.map(_._2)) val libraryJar = file(ScalaArtifacts.LibraryID) val binVersion = scalaBinaryVersion.value - val compilerJar = - if (ScalaInstance.isDotty(scalaVersion.value)) - file(ScalaArtifacts.dottyID(binVersion)) - else file(ScalaArtifacts.CompilerID) + val compilerJar = file(ScalaArtifacts.CompilerID) new ScalaInstance( scalaVersion.value, makeClassLoader(state.value)(allJars.toList),