Skip to content

Commit beb40d8

Browse files
SethTisueWojciechMazur
authored andcommitted
REPL: JLine: follow recommendation to use JNI, not JNA
as per the https://github.com/jline/jline3 readme fixes #22201 [Cherry-picked 0589be3]
1 parent 0bcc325 commit beb40d8

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

dist/libexec/common-shared

Lines changed: 1 addition & 3 deletions
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

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ object Build {
743743
Dependencies.compilerInterface,
744744
"org.jline" % "jline-reader" % "3.27.0", // used by the REPL
745745
"org.jline" % "jline-terminal" % "3.27.0",
746-
"org.jline" % "jline-terminal-jna" % "3.27.0", // needed for Windows
746+
"org.jline" % "jline-terminal-jni" % "3.27.0", // needed for Windows
747747
("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
748748
),
749749

0 commit comments

Comments
 (0)