From a2212fa8c7a2f702e706dec1e04f67291824339e Mon Sep 17 00:00:00 2001 From: Hamza REMMAL Date: Tue, 20 Feb 2024 15:42:37 +0100 Subject: [PATCH 1/4] Bump JLine to 3.19.0 -> 3.24.1 --- project/Build.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 64aab2371b8f..3f9f06dbb660 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -624,9 +624,9 @@ object Build { libraryDependencies ++= Seq( "org.scala-lang.modules" % "scala-asm" % "9.6.0-scala-1", // used by the backend Dependencies.compilerInterface, - "org.jline" % "jline-reader" % "3.19.0", // used by the REPL - "org.jline" % "jline-terminal" % "3.19.0", - "org.jline" % "jline-terminal-jna" % "3.19.0", // needed for Windows + "org.jline" % "jline-reader" % "3.24.1", // used by the REPL + "org.jline" % "jline-terminal" % "3.24.1", + "org.jline" % "jline-terminal-jna" % "3.24.1", // needed for Windows ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13), ), From 29461f46ff5fb9acc4ea57de0ac114f1b254ea5d Mon Sep 17 00:00:00 2001 From: Hamza REMMAL Date: Sat, 24 Feb 2024 12:16:12 +0100 Subject: [PATCH 2/4] Bump sbt from 1.9.7 to 1.9.9 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e8a1e246e8ad..04267b14af69 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.9 From b7696fa711e113e2a6a957edeaac644557956cd6 Mon Sep 17 00:00:00 2001 From: Hamza REMMAL Date: Sun, 25 Feb 2024 01:09:14 +0100 Subject: [PATCH 3/4] Update Coursier test --- .../dotty/tools/coursier/CoursierScalaTests.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala b/compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala index 8f9a9bd69a50..b8dfa833c437 100644 --- a/compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala +++ b/compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala @@ -76,7 +76,7 @@ class CoursierScalaTests: def emptyArgsEqualsRepl() = val output = CoursierScalaTests.csScalaCmd() - assertTrue(output.mkString("\n").contains("Unable to create a system terminal")) // Scala attempted to create REPL so we can assume it is working + assertTrue(output.mkString("\n").contains("Unable to create a terminal")) // Scala attempted to create REPL so we can assume it is working emptyArgsEqualsRepl() def run() = @@ -133,7 +133,7 @@ class CoursierScalaTests: def replWithArgs() = val output = CoursierScalaTests.csScalaCmd("-source", "3.0-migration") - assertTrue(output.mkString("\n").contains("Unable to create a system terminal")) // Scala attempted to create REPL so we can assume it is working + assertTrue(output.mkString("\n").contains("Unable to create a terminal")) // Scala attempted to create REPL so we can assume it is working replWithArgs() def argumentFile() = From adc2205606bdcff6800a118d8edfe3700b8be439 Mon Sep 17 00:00:00 2001 From: Hamza REMMAL Date: Mon, 26 Feb 2024 14:21:37 +0100 Subject: [PATCH 4/4] Bump JLine to 3.24.1-> 3.25.1 --- project/Build.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 3f9f06dbb660..f54fcdc3f133 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -624,9 +624,9 @@ object Build { libraryDependencies ++= Seq( "org.scala-lang.modules" % "scala-asm" % "9.6.0-scala-1", // used by the backend Dependencies.compilerInterface, - "org.jline" % "jline-reader" % "3.24.1", // used by the REPL - "org.jline" % "jline-terminal" % "3.24.1", - "org.jline" % "jline-terminal-jna" % "3.24.1", // needed for Windows + "org.jline" % "jline-reader" % "3.25.1", // used by the REPL + "org.jline" % "jline-terminal" % "3.25.1", + "org.jline" % "jline-terminal-jna" % "3.25.1", // needed for Windows ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13), ),