Skip to content

Commit

Permalink
REPL: JLine: follow recommendation to use JNI, not JNA
Browse files Browse the repository at this point in the history
  • Loading branch information
SethTisue committed Dec 13, 2024
1 parent 20e6f11 commit 0589be3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions dist/libexec/common-shared
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function onExit() {
# to reenable echo if we are interrupted before completing.
trap onExit INT TERM EXIT

unset cygwin mingw msys darwin conemu
unset cygwin mingw msys darwin

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

unset CYGPATHCMD
if [[ ${cygwin-} || ${mingw-} || ${msys-} ]]; then
# ConEmu terminal is incompatible with jna-5.*.jar
[[ (${CONEMUANSI-} || ${ConEmuANSI-}) ]] && conemu=true
# cygpath is used by various windows shells: cygwin, git-sdk, gitbash, msys, etc.
CYGPATHCMD=`which cygpath 2>/dev/null`
case "$TERM" in
Expand Down
2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ object Build {
Dependencies.compilerInterface,
"org.jline" % "jline-reader" % "3.27.0", // used by the REPL
"org.jline" % "jline-terminal" % "3.27.0",
"org.jline" % "jline-terminal-jna" % "3.27.0", // needed for Windows
"org.jline" % "jline-terminal-jni" % "3.27.0", // needed for Windows
("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),
),

Expand Down

0 comments on commit 0589be3

Please sign in to comment.