diff options
author | Stefan Zeiger <szeiger@novocode.com> | 2015-10-28 20:28:52 +0100 |
---|---|---|
committer | Stefan Zeiger <szeiger@novocode.com> | 2015-10-29 16:46:25 +0100 |
commit | 9debc84dcd57c331c184a3cf58b627045db632e0 (patch) | |
tree | 7e9fbec53a982fdf98ee09a20a1ed63d3e40cdcf /src/repl | |
parent | 5e080eb204dab36dd4ae1e42adc63737fe8a9e6d (diff) | |
download | scala-9debc84dcd57c331c184a3cf58b627045db632e0.tar.gz scala-9debc84dcd57c331c184a3cf58b627045db632e0.tar.bz2 scala-9debc84dcd57c331c184a3cf58b627045db632e0.zip |
Create shaded JLine in sbt build
Reusing parts of #4593, this commits adds two additional subprojects to
the sbt build:
- repl-jline, which is already used by the ant build, builds the part of
the REPL that depends on JLine. The actual JLine depenency is moved to
this project.
- repl-jline-shaded uses JarJar to create a shaded version of repl-jline
and jline.jar.
Unlike the ant build, this setup does not use any circular dependencies.
dist/mkBin puts all of quick/repl, quick/repl-jline and
quick/repl-jline-shaded onto the classpath of build-sbt/quick/bin/scala.
A future addition to the sbt build for building build-sbt/pack will have
to put the generated classfiles into the correct JARs, mirroring the old
structure.
Diffstat (limited to 'src/repl')
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/ILoop.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/ILoop.scala b/src/repl/scala/tools/nsc/interpreter/ILoop.scala index bf7c8551e5..adac438b37 100644 --- a/src/repl/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/repl/scala/tools/nsc/interpreter/ILoop.scala @@ -876,7 +876,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) if (settings.debug) { val readerDiags = (readerClasses, readers).zipped map { - case (cls, Failure(e)) => s" - $cls --> " + e.getStackTrace.mkString(e.toString+"\n\t", "\n\t","\n") + case (cls, Failure(e)) => s" - $cls --> \n\t" + scala.tools.nsc.util.stackTraceString(e) + "\n" case (cls, Success(_)) => s" - $cls OK" } Console.println(s"All InteractiveReaders tried: ${readerDiags.mkString("\n","\n","\n")}") |