From f213eb0175816ea85a8c5e27fd4cdc7efeb314db Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Fri, 11 Oct 2024 10:34:55 -0700 Subject: [PATCH 1/2] Bump jline3 to 3.27.0 --- build.sbt | 11 +++++++++-- project/Dependencies.scala | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index ce5054ba4..4115ff0c8 100644 --- a/build.sbt +++ b/build.sbt @@ -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", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 054794d69..f4932e547 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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 From 78a4cdff0b41dd928137a3bbd479cbbafab9c0b8 Mon Sep 17 00:00:00 2001 From: Friendseeker <66892505+Friendseeker@users.noreply.github.com> Date: Fri, 11 Oct 2024 13:43:46 -0700 Subject: [PATCH 2/2] Bump CI OS --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 903779edf..5d5fd16cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: java: 17 distribution: temurin jobtype: 8 - - os: windows-2019 + - os: windows-latest java: 8 distribution: zulu jobtype: 9