test & ci: bump deps, canary test clj-mergetool (#263)

Bump test and ci deps and tools to current releases.

Skipped kaocha v1.88.1376 as it seems to break clojure v1.9
compatibility. We'll wait to see if that was intentional before upgrading.

Add clj-mergetool to our lib canary tests. Closes #262.

.clj-kondo/taoensso/encore/config.edn

@@ -0,0 +1 @@
+{:hooks {:analyze-call {taoensso.encore/defalias taoensso.encore/defalias}}}

.clj-kondo/taoensso/encore/taoensso/encore.clj

@@ -0,0 +1,16 @@
+(ns taoensso.encore
+  (:require
+   [clj-kondo.hooks-api :as hooks]))
+
+(defn defalias [{:keys [node]}]
+  (let [[sym-raw src-raw] (rest (:children node))
+        src (if src-raw src-raw sym-raw)
+        sym (if src-raw
+              sym-raw
+              (symbol (name (hooks/sexpr src))))]
+    {:node (with-meta
+             (hooks/list-node
+               [(hooks/token-node 'def)
+                (hooks/token-node (hooks/sexpr sym))
+                (hooks/token-node (hooks/sexpr src))])
+             (meta src))}))

.github/workflows/native-image-test.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows, ubuntu, macos ]
-        java-version: [ '22' ]
+        java-version: [ '22.0.1' ]
         test: [ native, native-sci ]
         clojure-version: [ '1.11', '1.12' ]
 

README.adoc

@@ -51,6 +51,7 @@ Some projects using rewrite-clj v1
 // no unit tests:
 * https://github.com/lambdaisland/classpath[classpath] {not-canary-tested} - Classpath/classloader/deps.edn related utilities
 * https://github.com/nextjournal/clerk[clerk] {canary-tested} - Local-First Notebooks for Clojure
+* https://github.com/kurtharriger/clj-mergetool[clj-mergetool] {canary-tested} - Smarter git mergetool for clojure and edn
 * https://github.com/weavejester/cljfmt[cljfmt] {canary-tested} - A tool for formatting Clojure code
 * https://github.com/greglook/cljstyle[cljstyle] {canary-tested} - A tool for formatting Clojure code
 * https://github.com/clojure-lsp/clojure-lsp[clojure-lsp] {canary-tested} - Language Server (LSP) for Clojure

bb.edn

@@ -8,7 +8,7 @@
         lread/status-line {:git/url "https://github.com/lread/status-line.git"
                            :sha "cf44c15f30ea3867227fa61ceb823e5e942c707f"}
         etaoin/etaoin {:mvn/version "1.0.40"}
-        io.github.babashka/neil {:git/tag "v0.2.63" :git/sha "076fb83"}}
+        io.github.babashka/neil {:git/tag "v0.3.65" :git/sha "9a79582"}}
  :tasks {;; setup
          :requires ([clojure.string :as string]
                     [lread.status-line :as status])

deps.edn

@@ -101,7 +101,7 @@
                                  cli-matic/cli-matic {:mvn/version "0.5.4"}}}
 
            :apply-import-vars {:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
-                               :extra-deps {metosin/malli {:mvn/version "0.15.0"}
+                               :extra-deps {metosin/malli {:mvn/version "0.16.0"}
                                             io.aviso/pretty {:mvn/version "1.4.4"}}
                                :ns-default lread.apply-import-vars}
 
@@ -147,12 +147,13 @@
            ;;
            ;; Maintenance support
            ;;
-           :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.8.1185"}
-                                   org.slf4j/slf4j-simple {:mvn/version "2.0.12"} ;; to rid ourselves of logger warnings
+           :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.8.1194"}
+                                   org.slf4j/slf4j-simple {:mvn/version "2.0.13"} ;; to rid ourselves of logger warnings
                                    }
                       :override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
                       :main-opts ["-m" "antq.core"
                                   "--ignore-locals"
+                                  "--exclude=lambdaisland/kaocha@1.88.1376" ;; breaks clojure 1.9 compat, let's wait to see if that was intentional
                                   "--exclude=lambdaisland/kaocha@1.0.829" ;; https://github.com/lambdaisland/kaocha/issues/208
                                   "--exclude=com.bhauman/figwheel-main@0.2.15" ;; deployment was botched, some components missing
                                   "--exclude=org.clojure/clojurescript@1.11.121" ;; no evidence yet that this is an official release

package.json

@@ -6,6 +6,6 @@
     "karma-cljs-test": "^0.1.0",
     "karma-junit-reporter": "^2.0.0",
     "karma-spec-reporter": "^0.0.36",
-    "shadow-cljs": "^2.28.2"
+    "shadow-cljs": "^2.28.3"
   }
 }

script/test_libs.clj

@@ -272,7 +272,7 @@
             :show-deps-fn lein-deps-tree
             :test-cmds ["lein kaocha"]}
            {:name "antq"
-            :version "2.8.1185"
+            :version "2.8.1194"
             :platforms [:clj]
             :github-release {:repo "liquidz/antq"}
             :patch-fn deps-edn-v1-patch
@@ -295,6 +295,13 @@
             :patch-fn deps-edn-v1-patch
             :show-deps-fn cli-deps-tree
             :test-cmds ["bb test:clj :kaocha/reporter '[kaocha.report/documentation]'"]}
+           {:name "clj-mergetool"
+            :version "0.2.1"
+            :platforms [:clj]
+            :github-release {:repo "kurtharriger/clj-mergetool"}
+            :patch-fn deps-edn-v1-patch
+            :show-deps-fn cli-deps-tree
+            :test-cmds ["clojure -T:build test"]}
            {:name "cljfmt"
             :version "0.12.0"
             :platforms [:clj :cljs]
@@ -315,7 +322,7 @@
                         "bin/test unit"]}
            {:name "clojure-lsp"
             :platforms [:clj]
-            :version "2024.03.13-13.11.00"
+            :version "2024.03.31-19.10.13"
             :github-release {:repo "clojure-lsp/clojure-lsp"}
             :patch-fn clojure-lsp-patch
             :show-deps-fn clojure-lsp-deps
@@ -384,7 +391,7 @@
             :show-deps-fn cli-deps-tree
             :test-cmds ["clojure -M:test"]}
            {:name "rewrite-edn"
-            :version "0.4.7"
+            :version "0.4.8"
             :platforms [:clj]
             :github-release {:repo "borkdude/rewrite-edn"
                              :version-prefix "v"