From 0589be3356a274700bf7f69d709eb539c2d75f8b Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Thu, 12 Dec 2024 18:07:29 -0800
Subject: [PATCH] REPL: JLine: follow recommendation to use JNI, not JNA

as per the https://github.com/jline/jline3 readme

fixes #22201
---
 dist/libexec/common-shared | 4 +---
 project/Build.scala        | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dist/libexec/common-shared b/dist/libexec/common-shared
index 8c85993a5283..fa1e62c09241 100644
--- a/dist/libexec/common-shared
+++ b/dist/libexec/common-shared
@@ -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
@@ -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
diff --git a/project/Build.scala b/project/Build.scala
index 5aec4a4231a6..9ce706e9fe8f 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -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),
       ),