Skip to content

Commit a015a15

Browse files
authored
Bump JLine 3.19.0 -> 3.24.1 & sbt 1.9.7 -> 1.9.9 (#19744)
Fixes #5755, #19704 Tested locally and the difference in behaviour was observed. I'm not sure how to test it with the CI, if anybody has an idea, please let me know. Also, this issue might be a problem sbt/sbt#7177 Tested as follow: - Observe that the issue in `3.4.1-RC1` ```scala scala-cli repl -S 3.4.1-RC1 Welcome to Scala 3.4.1-RC1 (17.0.7, Java Java HotSpot(TM) 64-Bit Server VM). Type in expressions for evaluation. Or try :help. scala> class 😃 // defined class 😃 scala> cclas -- [E006] Not Found Error: ----------------------------------------------------- 1 |clas |^^^^ |Not found: clas - did you mean caps? | | longer explanation available when compiling with `-explain` 1 error found scala> ``` - Publish dotty locally with the correct jline version - Observe that the issue is fixed ```scala scala-cli repl -S 3.4.2-RC1-bin-SNAPSHOT Welcome to Scala 3.4.2-RC1-bin-SNAPSHOT-git-174d4c6 (17.0.7, Java Java HotSpot(TM) 64-Bit Server VM). Type in expressions for evaluation. Or try :help. scala> class 😃 // defined class 😃 scala> clas -- [E006] Not Found Error: ----------------------------------------------------- 1 |clas |^^^^ |Not found: clas - did you mean caps? | | longer explanation available when compiling with `-explain` 1 error found scala> ``
2 parents 6ced15b + adc2205 commit a015a15

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class CoursierScalaTests:
7676

7777
def emptyArgsEqualsRepl() =
7878
val output = CoursierScalaTests.csScalaCmd()
79-
assertTrue(output.mkString("\n").contains("Unable to create a system terminal")) // Scala attempted to create REPL so we can assume it is working
79+
assertTrue(output.mkString("\n").contains("Unable to create a terminal")) // Scala attempted to create REPL so we can assume it is working
8080
emptyArgsEqualsRepl()
8181

8282
def run() =
@@ -133,7 +133,7 @@ class CoursierScalaTests:
133133

134134
def replWithArgs() =
135135
val output = CoursierScalaTests.csScalaCmd("-source", "3.0-migration")
136-
assertTrue(output.mkString("\n").contains("Unable to create a system terminal")) // Scala attempted to create REPL so we can assume it is working
136+
assertTrue(output.mkString("\n").contains("Unable to create a terminal")) // Scala attempted to create REPL so we can assume it is working
137137
replWithArgs()
138138

139139
def argumentFile() =

project/Build.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -624,9 +624,9 @@ object Build {
624624
libraryDependencies ++= Seq(
625625
"org.scala-lang.modules" % "scala-asm" % "9.6.0-scala-1", // used by the backend
626626
Dependencies.compilerInterface,
627-
"org.jline" % "jline-reader" % "3.19.0", // used by the REPL
628-
"org.jline" % "jline-terminal" % "3.19.0",
629-
"org.jline" % "jline-terminal-jna" % "3.19.0", // needed for Windows
627+
"org.jline" % "jline-reader" % "3.25.1", // used by the REPL
628+
"org.jline" % "jline-terminal" % "3.25.1",
629+
"org.jline" % "jline-terminal-jna" % "3.25.1", // needed for Windows
630630
("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
631631
),
632632

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.7
1+
sbt.version=1.9.9

0 commit comments

Comments
 (0)