From 63dcb1957bcdff790db54f54fcf542607c74b5b7 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Thu, 29 Apr 2021 13:30:48 +0200 Subject: [PATCH] Move scalaInstanceTopLoader to compileBase settings --- main/src/main/scala/sbt/Defaults.scala | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 27a19aab6..0541ef90b 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -332,13 +332,6 @@ object Defaults extends BuildCommon { turbo :== SysProp.turbo, usePipelining :== SysProp.pipelining, 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 }, superShellThreshold :== SysProp.supershellThreshold, superShellMaxTasks :== SysProp.supershellMaxTasks, @@ -667,6 +660,13 @@ object Defaults extends BuildCommon { // This is included into JvmPlugin.projectSettings 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, crossVersion := (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled), pluginCrossBuild / sbtBinaryVersion := binarySbtVersion(