Merge pull request #12 from lrytz/topic/code-retreat

repls depends on interactive

Author: retronym

build.sbt

@@ -194,7 +194,7 @@ lazy val interactive = configureAsSubproject(project)
 lazy val repl = configureAsSubproject(project)
   .settings(libraryDependencies += jlineDep)
   .settings(disableDocsAndPublishingTasks: _*)
-  .dependsOn(compiler)
+  .dependsOn(compiler, interactive)
 
 lazy val scaladoc = configureAsSubproject(project)
   .settings(

build.xml

@@ -796,12 +796,6 @@ TODO:
       <path refid="asm.classpath"/>
     </path>
 
-    <path id="quick.repl.build.path">
-      <path refid="quick.compiler.build.path"/>
-      <pathelement location="${build-quick.dir}/classes/repl"/>
-      <path refid="repl.deps.classpath"/>
-    </path>
-
     <path id="quick.scalap.build.path">
       <path refid="quick.compiler.build.path"/>
       <pathelement location="${build-quick.dir}/classes/scalap"/>
@@ -832,6 +826,13 @@ TODO:
       <pathelement location="${build-quick.dir}/classes/interactive"/>
     </path>
 
+    <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 refid="repl.deps.classpath"/>
+    </path>
+
     <path id="quick.bin.tool.path">
       <path refid="quick.repl.build.path"/>
       <path refid="quick.actors.build.path"/>
@@ -1156,15 +1157,15 @@ TODO:
   <target name="quick.comp"       depends="quick.reflect">
     <staged-build with="locker"   stage="quick" project="compiler"/> </target>
 
-  <target name="quick.repl"       depends="quick.comp">
-    <staged-build with="locker"   stage="quick" project="repl"/> </target>
-
   <target name="quick.scaladoc"   depends="quick.comp">
     <staged-build with="locker"   stage="quick" project="scaladoc" version="scaladoc"/> </target>
 
   <target name="quick.interactive" depends="quick.comp, quick.scaladoc">
     <staged-build with="locker"    stage="quick" project="interactive"/> </target>
 
+  <target name="quick.repl"       depends="quick.comp, quick.interactive">
+    <staged-build with="locker"   stage="quick" project="repl"/> </target>
+
   <target name="quick.scalap"     depends="quick.repl">
     <staged-build with="locker"   stage="quick" project="scalap"/> </target>
 

src/intellij/repl.iml.SAMPLE

@@ -10,6 +10,7 @@
     <orderEntry type="module" module-name="compiler" />
     <orderEntry type="module" module-name="library" />
     <orderEntry type="module" module-name="reflect" />
+    <orderEntry type="module" module-name="interactive" />
     <orderEntry type="library" name="starr" level="project" />
     <orderEntry type="library" name="repl-deps" level="project" />
     <orderEntry type="library" name="asm" level="project" />