Merge pull request #2902 from smarter/auto-dotty-bridge

Automatically choose proper compiler bridge for dotty

main/src/main/scala/sbt/Defaults.scala

@@ -236,7 +236,13 @@ object Defaults extends BuildCommon {
       val _ = clean.value
       IvyActions.cleanCachedResolutionCache(ivyModule.value, streams.value.log)
     },
-    scalaCompilerBridgeSource := ModuleID(xsbti.ArtifactInfo.SbtOrganization, "compiler-interface", sbtVersion.value, Some("component")).sources()
+    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, Some("component")).sources()
+      else
+        ModuleID(xsbti.ArtifactInfo.SbtOrganization, "compiler-interface", sbtVersion.value, Some("component")).sources()
+    }
   )
   // must be a val: duplication detected by object identity
   private[this] lazy val compileBaseGlobal: Seq[Setting[_]] = globalDefaults(Seq(

notes/0.13.14/dotty_bridge.md

@@ -0,0 +1,11 @@
+### Improvements
+
+- When sbt detects that the project is compiled with dotty, it now automatically
+  set `scalaCompilerBridgeSource` correctly, this reduces the boilerplate needed
+  to make a dotty project. Note that dotty support in sbt is still considered
+  experimental and not officially supported, see [dotty.epfl.ch][dotty] for
+  more information. [#2902][2902] by [@smarter][@smarter]
+
+  [dotty]: http://dotty.epfl.ch/
+  [2902]: https://github.com/sbt/sbt/pull/2902
+  [@smarter]: https://github.com/smarter