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

Move scalaInstanceTopLoader to compileBase settings

This commit is contained in:
Adrien Piquerez 2021-04-29 13:30:48 +02:00
parent 1497686e57
commit 63dcb1957b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,13 +332,6 @@ object Defaults extends BuildCommon {
turbo :== SysProp.turbo, turbo :== SysProp.turbo,
usePipelining :== SysProp.pipelining, usePipelining :== SysProp.pipelining,
exportPipelining := usePipelining.value, exportPipelining := usePipelining.value,
useScalaReplJLine :== false,
scalaInstanceTopLoader := {
// the JLineLoader contains the SbtInterfaceClassLoader
if (!useScalaReplJLine.value)
classOf[org.jline.terminal.Terminal].getClassLoader // the JLineLoader
else classOf[Compilers].getClassLoader // the SbtInterfaceClassLoader
},
useSuperShell := { if (insideCI.value) false else ITerminal.console.isSupershellEnabled }, useSuperShell := { if (insideCI.value) false else ITerminal.console.isSupershellEnabled },
superShellThreshold :== SysProp.supershellThreshold, superShellThreshold :== SysProp.supershellThreshold,
superShellMaxTasks :== SysProp.supershellMaxTasks, superShellMaxTasks :== SysProp.supershellMaxTasks,
@ -667,6 +660,13 @@ object Defaults extends BuildCommon {
// This is included into JvmPlugin.projectSettings // This is included into JvmPlugin.projectSettings
def compileBase = inTask(console)(compilersSetting :: Nil) ++ compileBaseGlobal ++ Seq( def compileBase = inTask(console)(compilersSetting :: Nil) ++ compileBaseGlobal ++ Seq(
useScalaReplJLine :== false,
scalaInstanceTopLoader := {
// the JLineLoader contains the SbtInterfaceClassLoader
if (!useScalaReplJLine.value)
classOf[org.jline.terminal.Terminal].getClassLoader // the JLineLoader
else classOf[Compilers].getClassLoader // the SbtInterfaceClassLoader
},
scalaInstance := scalaInstanceTask.value, scalaInstance := scalaInstanceTask.value,
crossVersion := (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled), crossVersion := (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled),
pluginCrossBuild / sbtBinaryVersion := binarySbtVersion( pluginCrossBuild / sbtBinaryVersion := binarySbtVersion(