mirror of https://github.com/sbt/sbt.git
Merge pull request #7876 from Friendseeker/remove-jansi
[1.x] Remove direct dependency on `org.fusesource.jansi`
This commit is contained in:
commit
069ed90e7b
|
|
@ -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 := { () =>
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue