luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3481 from eed3si9n/wip/revert_bad_fport 

Revert "Automatically choose proper compiler bridge for dotty"
This commit is contained in:
eugene yokota 2017-08-28 13:20:50 -04:00 committed by GitHub
parent 8412f0254b aaf259f4fd
commit c951b38fea
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/scala/sbt/Defaults.scala
View File

@ -390,14 +390,7 @@ object Defaults extends BuildCommon {
val _ = clean.value val _ = clean.value
IvyActions.cleanCachedResolutionCache(ivyModule.value, streams.value.log) IvyActions.cleanCachedResolutionCache(ivyModule.value, streams.value.log)
}, },
scalaCompilerBridgeSource := { scalaCompilerBridgeSource := ZincUtil.getDefaultBridgeModule(scalaVersion.value)
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)
}
) )
// must be a val: duplication detected by object identity // must be a val: duplication detected by object identity
private[this] lazy val compileBaseGlobal: Seq[Setting[_]] = globalDefaults( private[this] lazy val compileBaseGlobal: Seq[Setting[_]] = globalDefaults(