REPL depends on presentation compiler

In preparation for use of the presentation compiler to drive
REPL tab completion, add a dependency in the build.

As far as the outside world is concerned, these are already comingled
in scala-compiler.jar, and this patch doesn't change that.

2 files changed, 3 insertions, 2 deletions

diff --git a/build.sbt b/build.sbt
index 7690df5430..495538c31e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -200,7 +200,7 @@ lazy val repl = configureAsSubproject(project)
     run <<= (run in Compile).partialInput(" -usejavacp") // Automatically add this so that `repl/run` works without additional arguments.
   )
   .settings(disableDocsAndPublishingTasks: _*)
-  .dependsOn(compiler)
+  .dependsOn(compiler, interactive)
 
 lazy val scaladoc = configureAsSubproject(project)
   .settings(
diff --git a/build.xml b/build.xml
index f568688c4e..8fab841b29 100755
--- a/build.xml
+++ b/build.xml
@@ -802,6 +802,7 @@ TODO:
 
     <path id="quick.repl.build.path">
       <path refid="quick.compiler.build.path"/>
+      <path refid="quick.interactive.build.path"/>
       <pathelement location="${build-quick.dir}/classes/repl"/>
     </path>
 
@@ -1168,7 +1169,7 @@ TODO:
   <target name="quick.comp"       depends="quick.reflect">
     <staged-build with="locker"   stage="quick" project="compiler"/> </target>
 
-  <target name="quick.repl"       depends="quick.comp">
+  <target name="quick.repl"       depends="quick.comp, quick.interactive">
     <staged-build with="locker"   stage="quick" project="repl"/>
     <staged-build with="locker"   stage="quick" project="repl-jline"/>