Merge pull request #7756 from Friendseeker/bump-jline3-2

[2.x] Bump jline3 to `3.27.0`
This commit is contained in:
eugene yokota 2024-10-11 18:03:57 -04:00 committed by GitHub
commit 00c0d58fe4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 4 deletions

View File

@ -44,7 +44,7 @@ jobs:
java: 17
distribution: temurin
jobtype: 8
- os: windows-2019
- os: windows-latest
java: 8
distribution: zulu
jobtype: 9

View File

@ -1043,8 +1043,15 @@ lazy val sbtClientProj = (project in file("client"))
nativeImageReady := { () =>
()
},
nativeImageVersion := "22.2.0",
nativeImageOutput := target.value / "bin" / "sbtn",
nativeImageVersion := "23.0",
nativeImageJvm := "graalvm-java23",
nativeImageOutput := {
val outputDir = (target.value / "bin").toPath
if (!Files.exists(outputDir)) {
Files.createDirectories(outputDir)
}
outputDir.resolve("sbtn").toFile
},
nativeImageOptions ++= Seq(
"--no-fallback",
s"--initialize-at-run-time=sbt.client",

View File

@ -82,7 +82,7 @@ object Dependencies {
// and the JLine 2 fork version, which uses the same JAnsi
val jline =
"org.scala-sbt.jline" % "jline" % "2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79"
val jline3Version = "3.24.1"
val jline3Version = "3.27.0"
val jline3Terminal = "org.jline" % "jline-terminal" % jline3Version
val jline3Jansi = "org.jline" % "jline-terminal-jansi" % jline3Version
val jline3JNA = "org.jline" % "jline-terminal-jna" % jline3Version