Commit fae6041

authored

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 fae6041Copy full SHA for fae6041

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ function onExit() {`
`26`	`26`	`# to reenable echo if we are interrupted before completing.`
`27`	`27`	`trap onExit INT TERM EXIT`
`28`	`28`
`29`		`-unset cygwin mingw msys darwin conemu`
	`29`	`+unset cygwin mingw msys darwin`
`30`	`30`
`31`	`31`	`# COLUMNS is used together with command line option '-pageWidth'.`
`32`	`32`	`if command -v tput >/dev/null 2>&1; then`
`@@ -55,8 +55,6 @@ esac`
`55`	`55`
`56`	`56`	`unset CYGPATHCMD`
`57`	`57`	`if [[ ${cygwin-} \|\| ${mingw-} \|\| ${msys-} ]]; then`
`58`		`- # ConEmu terminal is incompatible with jna-5.*.jar`
`59`		`- [[ (${CONEMUANSI-} \|\| ${ConEmuANSI-}) ]] && conemu=true`
`60`	`58`	`# cygpath is used by various windows shells: cygwin, git-sdk, gitbash, msys, etc.`
`61`	`59`	CYGPATHCMD=`which cygpath 2>/dev/null`
`62`	`60`	`case "$TERM" in`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -582,9 +582,9 @@ object Build {`
`582`	`582`	`libraryDependencies ++= Seq(`
`583`	`583`	`"org.scala-lang.modules" % "scala-asm" % "9.7.0-scala-2", // used by the backend`
`584`	`584`	`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`
`588`	`588`	`("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13),`
`589`	`589`	`),`
`590`	`590`

Comments

(0)