Merge pull request #20 from pmonks/dev

.github/workflows/ci.yml

@@ -21,12 +21,12 @@ jobs:
         java-version: [ 11, 17 ]  # Note: logback no longer supports Java 8, so we've dropped that from the matrix
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java-version }}
-      - uses: DeLaGuardo/setup-clojure@9.5
+      - uses: DeLaGuardo/setup-clojure@12.1
         with:
           cli: latest
       - uses: actions/cache@v3

.github/workflows/dependencies.yml

@@ -11,5 +11,5 @@ jobs:
     container:
       image: uochan/antq
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: java -jar /tmp/antq/antq.jar --skip=pom --exclude=com.github.pmonks/pbr --error-format="::error file={{file}}::{{message}}"

.github/workflows/deploy.yml

@@ -10,14 +10,14 @@ jobs:
     environment: clojars
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0    # Make sure we get the full history, or else the version number gets screwed up
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: DeLaGuardo/setup-clojure@9.5
+      - uses: DeLaGuardo/setup-clojure@12.1
         with:
           cli: latest
       - uses: actions/cache@v3

.github/workflows/docs.yml

@@ -9,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: DeLaGuardo/setup-clojure@9.5
+      - uses: DeLaGuardo/setup-clojure@12.1
         with:
           cli: latest
       - uses: actions/cache@v3

deps.edn

@@ -20,6 +20,6 @@
    {jansi-clj/jansi-clj           {:mvn/version "1.0.1"}
     com.github.pmonks/clj-wcwidth {:mvn/version "1.0.64"}}
  :aliases
-   {:build {:deps       {io.github.clojure/tools.build {:git/tag "v0.8.3" :git/sha "0d20256"}
+   {:build {:deps       {io.github.clojure/tools.build {:git/tag "v0.9.5" :git/sha "24f2894"}
                          com.github.pmonks/pbr         {:mvn/version "RELEASE"}}
             :ns-default pbr.build}}}

src/progress/determinate.clj

@@ -59,12 +59,6 @@ since your dog last pooped."
                     :tip   "🟨"}
   })
 
-(defn- col1-and-erase-to-eol!
-  []
-  (print "\r")
-  (jansi/erase-line!)
-  (flush))
-
 (defn- clamp
   "Clamps a value within a range."
   [mn mx x]
@@ -90,8 +84,10 @@ since your dog last pooped."
       (when line
         (ansi/save-cursor!)
         (jansi/cursor! 1 line))
-      (col1-and-erase-to-eol!)
-      (print (str ; Label (optional)
+      (print (str ; Go to the start of the line
+                  "\r"
+
+                  ; Label (optional)
                   (when-not (s/blank? label)
                     (ansi/apply-colours-and-attrs (:label-fg-colour style)
                                                   (:label-bg-colour style)
@@ -137,6 +133,7 @@ since your dog last pooped."
                                                                                        (:units-bg-colour style)
                                                                                        (:units-attrs     style)
                                                                                        (str " " units))))))))
+      (jansi/erase-line!)
       (when line (ansi/restore-cursor!))
       (flush))))
 
@@ -224,7 +221,7 @@ opts is a map, optionally containing these keys:
                   (when line
                     (ansi/save-cursor!)
                     (jansi/cursor! 1 line))
-                  (col1-and-erase-to-eol!)
+                  (print "\r")
                   (when line (ansi/restore-cursor!))))
               (flush))))))))