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

Scope compiler bridge to consoleProject

This commit is contained in:
Jason Pickens 2019-11-28 20:29:31 +13:00
parent 8c3245d569
commit 71bc3876d9
No known key found for this signature in database
GPG Key ID: C4A8C75C7876F1B5
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -488,6 +488,9 @@ object Defaults extends BuildCommon {
clean := clean.dependsOn(cleanIvy).value, clean := clean.dependsOn(cleanIvy).value,
scalaCompilerBridgeBinaryJar := None, scalaCompilerBridgeBinaryJar := None,
scalaCompilerBridgeSource := ZincLmUtil.getDefaultBridgeModule(scalaVersion.value), scalaCompilerBridgeSource := ZincLmUtil.getDefaultBridgeModule(scalaVersion.value),
consoleProject / scalaCompilerBridgeSource := ZincLmUtil.getDefaultBridgeModule(
appConfiguration.value.provider.scalaProvider.version
),
) )
// 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(

5
main/src/main/scala/sbt/internal/ConsoleProject.scala
View File

@ -25,7 +25,7 @@ object ConsoleProject {
val (state1, dependencyResolution) = val (state1, dependencyResolution) =
extracted.runTask(Keys.dependencyResolution, state) extracted.runTask(Keys.dependencyResolution, state)
val (_, scalaCompilerBridgeBinaryJar) = val (_, scalaCompilerBridgeBinaryJar) =
extracted.runTask(Keys.scalaCompilerBridgeBinaryJar, state1) extracted.runTask(Keys.scalaCompilerBridgeBinaryJar.in(Keys.consoleProject), state1)
val scalaInstance = { val scalaInstance = {
val scalaProvider = state.configuration.provider.scalaProvider val scalaProvider = state.configuration.provider.scalaProvider
ScalaInstance(scalaProvider.version, scalaProvider.launcher) ScalaInstance(scalaProvider.version, scalaProvider.launcher)
@ -50,7 +50,8 @@ object ConsoleProject {
componentProvider = app.provider.components, componentProvider = app.provider.components,
secondaryCacheDir = Option(zincDir), secondaryCacheDir = Option(zincDir),
dependencyResolution = dependencyResolution, dependencyResolution = dependencyResolution,
compilerBridgeSource = extracted.get(Keys.scalaCompilerBridgeSource), compilerBridgeSource =
extracted.get(Keys.scalaCompilerBridgeSource.in(Keys.consoleProject)),
scalaJarsTarget = zincDir, scalaJarsTarget = zincDir,
classLoaderCache = state1.get(BasicKeys.classLoaderCache), classLoaderCache = state1.get(BasicKeys.classLoaderCache),
log = log log = log

2
sbt/src/sbt-test/console/project-compiler-bridge/build.sbt
View File

@ -2,4 +2,4 @@ scalaVersion := "2.13.1"
// Send some bogus initial command so that it doesn't get stuck. // Send some bogus initial command so that it doesn't get stuck.
// The task itself will still succeed. // The task itself will still succeed.
Compile / consoleProject / initialCommands := "bail!" consoleProject / initialCommands := "bail!"