mirror of https://github.com/sbt/sbt.git
Merge pull request #3070 from eed3si9n/fport/2902
[fport] Automatically choose proper compiler bridge for dotty
This commit is contained in:
commit
075c3281b1
|
|
@ -283,7 +283,12 @@ object Defaults extends BuildCommon {
|
|||
val _ = clean.value
|
||||
IvyActions.cleanCachedResolutionCache(ivyModule.value, streams.value.log)
|
||||
},
|
||||
scalaCompilerBridgeSource := Compiler.defaultCompilerBridgeSource(scalaVersion.value)
|
||||
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 Compiler.defaultCompilerBridgeSource(scalaVersion.value)
|
||||
}
|
||||
)
|
||||
// must be a val: duplication detected by object identity
|
||||
private[this] lazy val compileBaseGlobal: Seq[Setting[_]] = globalDefaults(Seq(
|
||||
|
|
|
|||
|
|
@ -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
|
||||
Loading…
Reference in New Issue