summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-06-24 15:19:05 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-06-24 18:10:42 +1000
commit1f7417c763fb199cacc6afedc6e54796916fd673 (patch)
treebd00d7e0e47be310172f01c758c01ca5430063c4 /build.sbt
parent73f40564a6b19e8b15f0908c3e24f1a8fe405605 (diff)
parent1b09e12ef3b3fea1cab56bac893295f74de23b8b (diff)
downloadscala-1f7417c763fb199cacc6afedc6e54796916fd673.tar.gz
scala-1f7417c763fb199cacc6afedc6e54796916fd673.tar.bz2
scala-1f7417c763fb199cacc6afedc6e54796916fd673.zip
Merge branch '2.11.x' into merge/2.11.x-to-2.12.x-20150624
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt8
1 files changed, 7 insertions, 1 deletions
diff --git a/build.sbt b/build.sbt
index b7a32e0cf0..03e0e73fc8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -191,8 +191,14 @@ lazy val interactive = configureAsSubproject(project)
.settings(disableDocsAndPublishingTasks: _*)
.dependsOn(compiler)
+// TODO: SI-9339 embed shaded copy of jline & its interface (see #4563)
lazy val repl = configureAsSubproject(project)
- .settings(libraryDependencies += jlineDep)
+ .settings(
+ libraryDependencies += jlineDep,
+ connectInput in run := true,
+ outputStrategy in run := Some(StdoutOutput),
+ run <<= (run in Compile).partialInput(" -usejavacp") // Automatically add this so that `repl/run` works without additional arguments.
+ )
.settings(disableDocsAndPublishingTasks: _*)
.dependsOn(compiler)