Skip to content

Commit fae6041

Browse files
Backport "REPL: JLine: follow recommendation to use JNI, not JNA; also JLine 3.27.1 (was 3.27.0)" to LTS (#22377)
Backports #22205 to Scala 3.3.5-RC2 LTS
2 parents bf8aee1 + bfebac4 commit fae6041

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

dist/bin/common

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function onExit() {
2626
# to reenable echo if we are interrupted before completing.
2727
trap onExit INT TERM EXIT
2828

29-
unset cygwin mingw msys darwin conemu
29+
unset cygwin mingw msys darwin
3030

3131
# COLUMNS is used together with command line option '-pageWidth'.
3232
if command -v tput >/dev/null 2>&1; then
@@ -55,8 +55,6 @@ esac
5555

5656
unset CYGPATHCMD
5757
if [[ ${cygwin-} || ${mingw-} || ${msys-} ]]; then
58-
# ConEmu terminal is incompatible with jna-5.*.jar
59-
[[ (${CONEMUANSI-} || ${ConEmuANSI-}) ]] && conemu=true
6058
# cygpath is used by various windows shells: cygwin, git-sdk, gitbash, msys, etc.
6159
CYGPATHCMD=`which cygpath 2>/dev/null`
6260
case "$TERM" in

project/Build.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -582,9 +582,9 @@ object Build {
582582
libraryDependencies ++= Seq(
583583
"org.scala-lang.modules" % "scala-asm" % "9.7.0-scala-2", // used by the backend
584584
Dependencies.compilerInterface,
585-
"org.jline" % "jline-reader" % "3.27.0", // used by the REPL
586-
"org.jline" % "jline-terminal" % "3.27.0",
587-
"org.jline" % "jline-terminal-jna" % "3.27.0", // needed for Windows
585+
"org.jline" % "jline-reader" % "3.27.1", // used by the REPL
586+
"org.jline" % "jline-terminal" % "3.27.1",
587+
"org.jline" % "jline-terminal-jni" % "3.27.1", // needed for Windows
588588
("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
589589
),
590590

0 commit comments

Comments
 (0)