Skip to content

Commit 6e1a809

Browse files
Backport "Bump JLine 3.19.0 -> 3.24.1 & sbt 1.9.7 -> 1.9.9" to LTS (#20938)
Backports #19744 to the LTS branch. PR submitted by the release tooling. [skip ci]
2 parents fa907b9 + d0b340a commit 6e1a809

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
@@ -579,9 +579,9 @@ object Build {
579579
libraryDependencies ++= Seq(
580580
"org.scala-lang.modules" % "scala-asm" % "9.6.0-scala-1", // used by the backend
581581
Dependencies.compilerInterface,
582-
"org.jline" % "jline-reader" % "3.19.0", // used by the REPL
583-
"org.jline" % "jline-terminal" % "3.19.0",
584-
"org.jline" % "jline-terminal-jna" % "3.19.0", // needed for Windows
582+
"org.jline" % "jline-reader" % "3.25.1", // used by the REPL
583+
"org.jline" % "jline-terminal" % "3.25.1",
584+
"org.jline" % "jline-terminal-jna" % "3.25.1", // needed for Windows
585585
("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
586586
),
587587

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)