Fix JLine dependencies

jline-$VERSION.jar is a bundle that contains the content of
jline-terminal-$VERSION.jar and other modules. jline-terminal-jna
depends on jline-terminal. This means that the Dotty build depends on
both jline and jline-terminal and classfiles may be read from either
jar (dependencies on the classpath are usually not in a stable order).
They should be identical so it's not a big problem, but it breaks Zinc
incremental compilation. This commit fixes this by not using the jline
bundle jar anymore.

Author: smarter

compiler/test/dotty/Jars.scala

@@ -22,17 +22,21 @@ object Jars {
   lazy val scalaXml: String =
     findJarFromRuntime("scala-xml")
 
-  /** JLine Jar */
-  lazy val jline: String =
-    findJarFromRuntime("jline-3.7.0")
+  /** jline-terminal jar */
+  lazy val jlineTerminal: String =
+    findJarFromRuntime("jline-terminal-3.7.0")
+
+  /** jline-reader jar */
+  lazy val jlineReader: String =
+    findJarFromRuntime("jline-reader-3.7.0")
 
   /** Dotty extras classpath from env or properties */
   val dottyExtras: List[String] = sys.env.get("DOTTY_EXTRAS")
     .map(_.split(":").toList).getOrElse(Properties.dottyExtras)
 
   /** Dotty test dependencies */
   val dottyTestDeps: List[String] =
-    dottyLib :: dottyCompiler :: dottyInterfaces :: jline :: dottyExtras
+    dottyLib :: dottyCompiler :: dottyInterfaces :: jlineTerminal :: jlineReader :: dottyExtras
 
   /** Dotty runtime with compiler dependencies, used for quoted.Expr.run */
   lazy val dottyRunWithCompiler: List[String] =

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -205,7 +205,7 @@ class CompilationTests extends ParallelTesting {
       // as well as bootstrapped compiler:
       defaultOutputDir + dotty1Group + "/dotty/:" +
       // and the other compiler dependecies:
-      Jars.dottyInterfaces + ":" + Jars.jline,
+      Jars.dottyInterfaces + ":" + Jars.jlineTerminal + ":" + Jars.jlineReader,
       Array("-Ycheck-reentrant", "-Yemit-tasty-in-class")
     )
 

dist/bin/common

@@ -119,7 +119,7 @@ SCALA_ASM=$(find_lib "*scala-asm*")
 SCALA_LIB=$(find_lib "*scala-library*")
 SCALA_XML=$(find_lib "*scala-xml*")
 SBT_INTF=$(find_lib "*compiler-interface*")
-JLINE=$(find_lib "*jline-3*")
+JLINE_READER=$(find_lib "*jline-reader-3*")
 JLINE_TERMINAL=$(find_lib "*jline-terminal-3*")
 JLINE_TERMINAL_JNA=$(find_lib "*jline-terminal-jna-3*")
 

dist/bin/dotc

@@ -66,7 +66,7 @@ classpathArgs () {
   toolchain+="$DOTTY_COMP$PSEP"
 
   # jine
-  toolchain+="$JLINE$PSEP"
+  toolchain+="$JLINE_READER$PSEP"
   toolchain+="$JLINE_TERMINAL$PSEP"
   toolchain+="$JLINE_TERMINAL_JNA"
 

project/Build.scala

@@ -517,7 +517,8 @@ object Build {
         ("org.scala-lang.modules" %% "scala-xml" % "1.1.0").withDottyCompat(scalaVersion.value),
         "org.scala-lang" % "scala-library" % scalacVersion % "test",
         Dependencies.compilerInterface(sbtVersion.value),
-        "org.jline" % "jline" % "3.7.0", // used by the REPL
+        "org.jline" % "jline-reader" % "3.7.0",   // used by the REPL
+        "org.jline" % "jline-terminal" % "3.7.0",
         "org.jline" % "jline-terminal-jna" % "3.7.0" // needed for Windows
       ),