Skip to content

Commit

Permalink
Bump JLine 3.19.0 -> 3.24.1 & sbt 1.9.7 -> 1.9.9 (#19744)
Browse files Browse the repository at this point in the history
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>
``
  • Loading branch information
hamzaremmal authored Feb 26, 2024
2 parents 6ced15b + adc2205 commit a015a15
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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() =
Expand Down Expand Up @@ -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() =
Expand Down
6 changes: 3 additions & 3 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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.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),
),

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.7
sbt.version=1.9.9

0 comments on commit a015a15

Please sign in to comment.