Merge pull request #4983 from dotty-staging/fix-jline-deps

Fix JLine dependencies

Author: allanrenucci

.drone.yml

@@ -23,22 +23,22 @@ pipeline:
   # We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
   test:
     group: test
-    image: lampepfl/dotty:2018-06-29
+    image: lampepfl/dotty:2018-08-22
     commands:
       - cp -R . /tmp/1/ && cd /tmp/1/
       - ./project/scripts/sbt ";compile ;test"
       - ./project/scripts/cmdTests
 
   test_bootstrapped:
     group: test
-    image: lampepfl/dotty:2018-06-29
+    image: lampepfl/dotty:2018-08-22
     commands:
       - cp -R . /tmp/2/ && cd /tmp/2/
       - ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
 
   test_sbt:
     group: test
-    image: lampepfl/dotty:2018-06-29
+    image: lampepfl/dotty:2018-08-22
     commands:
       - cp -R . /tmp/4/ && cd /tmp/4/
       - ./project/scripts/sbt sbt-dotty/scripted
@@ -48,7 +48,7 @@ pipeline:
 
   # DOCUMENTATION:
   documentation:
-    image: lampepfl/dotty:2018-06-29
+    image: lampepfl/dotty:2018-08-22
     commands:
       - ./project/scripts/genDocs
     secrets: [ bot_pass ]
@@ -60,7 +60,7 @@ pipeline:
   # PUBLISHING:
   # Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
   publish_nightly:
-    image: lampepfl/dotty:2018-06-29
+    image: lampepfl/dotty:2018-08-22
     environment:
       - NIGHTLYBUILD=yes
     commands:
@@ -71,7 +71,7 @@ pipeline:
       environment: nightly
 
   publish_release:
-    image: lampepfl/dotty:2018-06-29
+    image: lampepfl/dotty:2018-08-22
     environment:
       - RELEASEBUILD=yes
     commands:
@@ -95,7 +95,7 @@ pipeline:
       event: tag
 
   publish_sbt_release:
-    image: lampepfl/dotty:2018-06-29
+    image: lampepfl/dotty:2018-08-22
     environment:
       - RELEASEBUILD=yes
     commands:

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.9.0")
+
+  /** jline-reader jar */
+  lazy val jlineReader: String =
+    findJarFromRuntime("jline-reader-3.9.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,8 +517,9 @@ 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-terminal-jna" % "3.7.0" // needed for Windows
+        "org.jline" % "jline-reader" % "3.9.0",   // used by the REPL
+        "org.jline" % "jline-terminal" % "3.9.0",
+        "org.jline" % "jline-terminal-jna" % "3.9.0" // needed for Windows
       ),
 
       // For convenience, change the baseDirectory when running the compiler