⬆️ Upgrade dependency and fix fallout

Author: pmonks

deps.edn

@@ -9,12 +9,9 @@
 ;
 
 {:deps
-   {jansi-clj/jansi-clj           {:mvn/version "1.0.5"}
+   {jansi-clj/jansi-clj           {:mvn/version "2.0.0"}
     com.github.pmonks/clj-wcwidth {:mvn/version "1.0.125"}
-    com.github.pmonks/embroidery  {:mvn/version "1.0.44"}
-
-    ; Force the latest version of JANSI, since jansi-clj is out of date
-    org.fusesource.jansi/jansi    {:mvn/version "2.4.2"}}
+    com.github.pmonks/embroidery  {:mvn/version "1.0.44"}}
  :aliases
    {:build {:deps       {com.github.pmonks/pbr {:mvn/version "RELEASE"}}
             :ns-default pbr.build}}}

src/progress/ansi.clj

@@ -22,19 +22,11 @@
 
 (def available?
   "Are ANSI escape sequences available on this JVM's stdout?"
-  (case (.name (.getType (org.fusesource.jansi.AnsiConsole/out)))
+  (case (.name (.getType (org.jline.jansi.AnsiConsole/out)))
     "Unsupported" false
     "Redirected"  false
     true))
 
-(defn terminal-width
-  "The width, in display columns, of the terminal window this JVM is running in.
-  Returns `nil` if the width cannot be determined."
-  []
-  (let [w (org.fusesource.jansi.AnsiConsole/getTerminalWidth)]
-    (when (pos? w)
-      w)))
-
 (defn save-cursor!
   "Issues both SCO and DEC save-cursor ANSI codes, for maximum compatibility."
   []

src/progress/determinate.clj

@@ -235,7 +235,7 @@
     {:keys [style label line width total units counter? preserve? redraw-rate]
        :or {style       (get styles default-style)
             total       100
-            width       (if-let [w (ansi/terminal-width)]
+            width       (if-let [w (jansi/terminal-width)]
                           (- w 2)  ; Allow space for the cursor
                           72)
             counter?    true

test/progress/indeterminate_test.clj

@@ -16,7 +16,11 @@
             [progress.indeterminate :as pi]))
 
 (jansi/erase-screen!)
-(println "\n☔️ Running tests on Clojure" (clojure-version) "/ JVM" (System/getProperty "java.version") (str "(" (System/getProperty "java.vm.name") " v" (System/getProperty "java.vm.version") ")"))
+
+(println "\n☔️ Running tests on Clojure" (clojure-version)
+         "/ JVM" (System/getProperty "java.version") (str "(" (System/getProperty "java.vm.name") " " (System/getProperty "java.vm.version") ")")
+         "/ ANSI escape sequences available?" (if ansi/available? "✅" (str "❌ (" (.name (.getType (org.jline.jansi.AnsiConsole/out))) ")")))
+
 (println
   (jansi/yellow-bg-bright
     (jansi/red