Skip to content

Commit 7ae2d65

Browse files
REPL: JLine: follow recommendation to use JNI, not JNA; also JLine 3.27.1 (was 3.27.0) (#22205)
as per the https://github.com/jline/jline3 readme and as per discussion and linked items on #22201 fixes #22201 note that as far as I can tell, the stuff I removed from libexec/common-shared is dead code @philwalk dunno if you're still around but judging from #12405 you might be a good reviewer here note that I believe we _don't_ need to also port scala/scala#10889 here, since we are already using separate JLine JARs rather than the all-in-one JAR I've chosen not to upgrade all the way to JLine 3.28.0 at the moment, as it is quite new (2 days ago) and doesn't appear to have any fixes that might be critical.
2 parents 0041987 + e5e4c40 commit 7ae2d65

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Diff for: dist/libexec/common-shared

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

31-
unset cygwin mingw msys darwin conemu
31+
unset cygwin mingw msys darwin
3232

3333
# COLUMNS is used together with command line option '-pageWidth'.
3434
if command -v tput >/dev/null 2>&1; then
@@ -57,8 +57,6 @@ esac
5757

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

Diff for: project/Build.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -763,9 +763,9 @@ object Build {
763763
libraryDependencies ++= Seq(
764764
"org.scala-lang.modules" % "scala-asm" % "9.7.0-scala-2", // used by the backend
765765
Dependencies.compilerInterface,
766-
"org.jline" % "jline-reader" % "3.27.0", // used by the REPL
767-
"org.jline" % "jline-terminal" % "3.27.0",
768-
"org.jline" % "jline-terminal-jna" % "3.27.0", // needed for Windows
766+
"org.jline" % "jline-reader" % "3.27.1", // used by the REPL
767+
"org.jline" % "jline-terminal" % "3.27.1",
768+
"org.jline" % "jline-terminal-jni" % "3.27.1", // needed for Windows
769769
("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
770770
),
771771

0 commit comments

Comments
 (0)