Merge pull request #3481 from eed3si9n/wip/revert_bad_fport

Revert "Automatically choose proper compiler bridge for dotty"
sbt · Aug 28, 2017 · c951b38 · c951b38
2 parents 8412f02 + aaf259f
commit c951b38
Showing 1 changed file with 1 addition and 8 deletions.
diff --git 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(