From 6cabb9b4cb95e1c8bdd373e89b9cf77656e7ca84 Mon Sep 17 00:00:00 2001 From: Martin Duhem Date: Sun, 31 Jan 2016 17:01:55 +0100 Subject: [PATCH] Update bridge retrieval in `consoleProject` Fixes sbt/sbt#2428 --- main/src/main/scala/sbt/ConsoleProject.scala | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/ConsoleProject.scala b/main/src/main/scala/sbt/ConsoleProject.scala index a484d4e8f..3d66cf552 100644 --- a/main/src/main/scala/sbt/ConsoleProject.scala +++ b/main/src/main/scala/sbt/ConsoleProject.scala @@ -11,7 +11,13 @@ object ConsoleProject { val cpImports = new Imports(extracted, state) val bindings = ("currentState" -> state) :: ("extracted" -> extracted) :: ("cpHelpers" -> cpImports) :: Nil val unit = extracted.currentUnit - val compiler = Compiler.compilers(ClasspathOptions.repl)(state.configuration, log).scalac + val (_, ivyConf) = extracted.runTask(Keys.ivyConfiguration, state) + val scalaInstance = { + val scalaProvider = state.configuration.provider.scalaProvider + ScalaInstance(scalaProvider.version, scalaProvider.launcher) + } + val sourcesModule = extracted.get(Keys.scalaCompilerBridgeSource) + val compiler = Compiler.scalaCompiler(scalaInstance, ClasspathOptions.repl, ivyConf, sourcesModule)(state.configuration, log) val imports = BuildUtil.getImports(unit.unit) ++ BuildUtil.importAll(bindings.map(_._1)) val importString = imports.mkString("", ";\n", ";\n\n") val initCommands = importString + extra