From f864e1c26da1ac189f9da6781000f4c942ba7578 Mon Sep 17 00:00:00 2001
From: friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Thu, 7 Nov 2024 22:07:07 -0800
Subject: [PATCH 1/2] Bye jansi

---
 build.sbt                                   | 1 -
 client/src/main/java/sbt/client/Client.java | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/build.sbt b/build.sbt
index 2cb003575..c3bfe57cd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1027,7 +1027,6 @@ lazy val sbtClientProj = (project in file("client"))
     bspEnabled := false,
     crossPaths := false,
     exportJars := true,
-    libraryDependencies += jansi,
     libraryDependencies += scalatest % Test,
     Compile / mainClass := Some("sbt.client.Client"),
     nativeImageReady := { () =>
diff --git a/client/src/main/java/sbt/client/Client.java b/client/src/main/java/sbt/client/Client.java
index 00e1d6ff8..909b6b28c 100644
--- a/client/src/main/java/sbt/client/Client.java
+++ b/client/src/main/java/sbt/client/Client.java
@@ -9,19 +9,13 @@
 package sbt.client;
 
 import sbt.internal.client.NetworkClient;
-import java.nio.file.Paths;
-import org.fusesource.jansi.AnsiConsole;
 
 public class Client {
   public static void main(String[] args) {
-    boolean isWin = System.getProperty("os.name").toLowerCase().startsWith("win");
     try {
-      if (isWin) AnsiConsole.systemInstall();
       NetworkClient.main(args);
     } catch (final Throwable t) {
       t.printStackTrace();
-    } finally {
-      if (isWin) AnsiConsole.systemUninstall();
     }
   }
 }

From c47d01738ff9d32c76f55387a54dd9609f7b0b98 Mon Sep 17 00:00:00 2001
From: friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Thu, 7 Nov 2024 22:08:00 -0800
Subject: [PATCH 2/2] Remove jansi from WindowsInputStream

---
 .../src/main/scala/sbt/internal/util/WindowsInputStream.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/WindowsInputStream.scala b/internal/util-logging/src/main/scala/sbt/internal/util/WindowsInputStream.scala
index 4c1477fff..e6abc6924 100644
--- a/internal/util-logging/src/main/scala/sbt/internal/util/WindowsInputStream.scala
+++ b/internal/util-logging/src/main/scala/sbt/internal/util/WindowsInputStream.scala
@@ -11,7 +11,7 @@ package sbt.internal.util
 import java.io.InputStream
 import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.atomic.AtomicBoolean
-import org.fusesource.jansi.internal.Kernel32
+import org.jline.nativ.Kernel32
 import org.jline.utils.InfoCmp.Capability
 import scala.annotation.tailrec
 import Terminal.SimpleInputStream