From aaf259f4fd42ae4839d4cc76904d36cbd1e6ed55 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 28 Aug 2017 12:12:09 -0400 Subject: [PATCH] Revert "Automatically choose proper compiler bridge for dotty" This reverts commit 2283c68031732751b2488d3571f3bf68a6694178. --- main/src/main/scala/sbt/Defaults.scala | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index b45ce316b..d4f5ba1f2 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -390,14 +390,7 @@ object Defaults extends BuildCommon { val _ = clean.value IvyActions.cleanCachedResolutionCache(ivyModule.value, streams.value.log) }, - scalaCompilerBridgeSource := { - if (ScalaInstance.isDotty(scalaVersion.value)) - // Maintained at https://github.com/lampepfl/dotty/tree/master/sbt-bridge - ModuleID(scalaOrganization.value, "dotty-sbt-bridge", scalaVersion.value) - .withConfigurations(Some("component")) - .sources() - else ZincUtil.getDefaultBridgeModule(scalaVersion.value) - } + scalaCompilerBridgeSource := ZincUtil.getDefaultBridgeModule(scalaVersion.value) ) // must be a val: duplication detected by object identity private[this] lazy val compileBaseGlobal: Seq[Setting[_]] = globalDefaults(