From 6dba5e4ec004cbb44cc110b1c3d4c627cb43da21 Mon Sep 17 00:00:00 2001
From: Friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Thu, 7 Nov 2024 18:46:04 -0800
Subject: [PATCH 1/2] Bye jansi

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

diff --git a/build.sbt b/build.sbt
index 37def7c08..e23addb45 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1170,7 +1170,6 @@ lazy val sbtClientProj = (project in file("client"))
     mimaPreviousArtifacts := Set.empty,
     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 dcabbf158..491d725b8 100644
--- a/client/src/main/java/sbt/client/Client.java
+++ b/client/src/main/java/sbt/client/Client.java
@@ -9,20 +9,16 @@
 package sbt.client;
 
 import sbt.internal.client.NetworkClient;
-import org.fusesource.jansi.AnsiConsole;
 
 public class Client {
   public static void main(final String[] args) {
-    boolean isWin = System.getProperty("os.name").toLowerCase().startsWith("win");
     boolean hadError = false;
     try {
-      if (isWin) AnsiConsole.systemInstall();
       NetworkClient.main(args);
     } catch (final Throwable t) {
       t.printStackTrace();
       hadError = true;
     } finally {
-      if (isWin) AnsiConsole.systemUninstall();
       if (hadError) System.exit(1);
     }
   }

From b621db683c20d8a796393bbe294a39754cad793b Mon Sep 17 00:00:00 2001
From: Friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Thu, 7 Nov 2024 19:15:13 -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 4c0f42f01..0fd469a50 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