luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7876 from Friendseeker/remove-jansi 

[1.x] Remove direct dependency on `org.fusesource.jansi`
This commit is contained in:
eugene yokota 2024-11-16 20:43:21 -05:00 committed by GitHub
parent fd37450ede b621db683c
commit 069ed90e7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.sbt
View File

@ -1170,7 +1170,6 @@ lazy val sbtClientProj = (project in file("client"))
mimaPreviousArtifacts := Set.empty, mimaPreviousArtifacts := Set.empty,
crossPaths := false, crossPaths := false,
exportJars := true, exportJars := true,
libraryDependencies += jansi,
libraryDependencies += scalatest % Test, libraryDependencies += scalatest % Test,
Compile / mainClass := Some("sbt.client.Client"), Compile / mainClass := Some("sbt.client.Client"),
nativeImageReady := { () => nativeImageReady := { () =>

4
client/src/main/java/sbt/client/Client.java
View File

@ -9,20 +9,16 @@
package sbt.client; package sbt.client;
import sbt.internal.client.NetworkClient; import sbt.internal.client.NetworkClient;
import org.fusesource.jansi.AnsiConsole;
public class Client { public class Client {
public static void main(final String[] args) { public static void main(final String[] args) {
boolean isWin = System.getProperty("os.name").toLowerCase().startsWith("win");
boolean hadError = false; boolean hadError = false;
try { try {
if (isWin) AnsiConsole.systemInstall();
NetworkClient.main(args); NetworkClient.main(args);
} catch (final Throwable t) { } catch (final Throwable t) {
t.printStackTrace(); t.printStackTrace();
hadError = true; hadError = true;
} finally { } finally {
if (isWin) AnsiConsole.systemUninstall();
if (hadError) System.exit(1); if (hadError) System.exit(1);
} }
} }

2
internal/util-logging/src/main/scala/sbt/internal/util/WindowsInputStream.scala
View File

@ -11,7 +11,7 @@ package sbt.internal.util
import java.io.InputStream import java.io.InputStream
import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.LinkedBlockingQueue
import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicBoolean
import org.fusesource.jansi.internal.Kernel32 import org.jline.nativ.Kernel32
import org.jline.utils.InfoCmp.Capability import org.jline.utils.InfoCmp.Capability
import scala.annotation.tailrec import scala.annotation.tailrec
import Terminal.SimpleInputStream import Terminal.SimpleInputStream