Skip to content

Commit bf3bad5

Browse files
authored
test: bump deps (#393)
* test: bump deps Of note: clojure-mcp depends on rewrite-clj, add it to our lib test suite * ci: lib tests: clojure-mcp requires jdk17+ Bump ci for lib tests to use jdk21 (was using jdk11). * ci: test libs: allow jdk to be specified The new default is jdk21, but MrAnderson tests require jdk11 * The easiest thing to make is yaml typos * see previous commit comment
1 parent cfefa27 commit bf3bad5

File tree

4 files changed

+28
-9
lines changed

4 files changed

+28
-9
lines changed

.github/workflows/libs-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
- name: Setup
4949
uses: ./.github/workflows/shared-setup
5050
with:
51+
jdk: ${{ matrix.jdk }}
5152
clj-cache-prefix: clj-libs-deps-${{ matrix.lib-name }}
5253
clj-cache-hash-files: "'script/test_libs.clj','deps.edn','bb.edn'"
5354

README.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ Some projects using rewrite-clj v1
5656
* https://github.com/weavejester/cljfmt[cljfmt] {canary-tested} - A tool for formatting Clojure code
5757
* https://github.com/greglook/cljstyle[cljstyle] {canary-tested} - A tool for formatting Clojure code
5858
* https://github.com/clojure-lsp/clojure-lsp[clojure-lsp] {canary-tested} - Language Server (LSP) for Clojure
59+
* https://github.com/bhauman/clojure-mcp[clojure-mcp] {canary-tested} - REPL-Driven Development with AI Assistance
5960
// repo is not version tagged:
6061
* https://github.com/mauricioszabo/duck-repled[duck-repled] {not-canary-tested} - Transform your REPL interation into Pathom queries
6162
* https://github.com/jonase/kibit[kibit] {canary-tested} - There's a function for that!

deps.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
{;; for disabling the official compiler
3737
:classpath-overrides {org.clojure/clojure nil}
3838
:extra-deps {com.github.flow-storm/clojure {:mvn/version "1.12.1"}
39-
com.github.flow-storm/flow-storm-dbg {:mvn/version "4.4.4"}}
39+
com.github.flow-storm/flow-storm-dbg {:mvn/version "4.4.5"}}
4040
:jvm-opts ["-Dclojure.storm.instrumentEnable=true"]}
4141

4242
:nrepl/jvm

script/test_libs.clj

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
[io.aviso.ansi :as ansi]
1616
[lread.status-line :as status]))
1717

18+
(def default-jdk "21")
19+
1820
(defn shcmd [cmd & args]
1921
(let [[opts cmd args] (if (map? cmd)
2022
[cmd (first args) (rest args)]
@@ -327,11 +329,20 @@
327329
"bin/test unit"]}
328330
{:name "clojure-lsp"
329331
:platforms [:clj]
330-
:version "2025.05.27-13.56.57"
332+
:version "2025.06.06-19.04.49"
331333
:github-release {:repo "clojure-lsp/clojure-lsp"}
332334
:patch-fn clojure-lsp-patch
333335
:show-deps-fn clojure-lsp-deps
334336
:test-cmds ["bb test"]}
337+
{:name "clojure-mcp"
338+
:platforms [:clj]
339+
:version "0.1.1-alpha"
340+
:github-release {:repo "bhauman/clojure-mcp"
341+
:via :tag
342+
:version-prefix "v"}
343+
:patch-fn deps-edn-v1-patch
344+
:show-deps-fn cli-deps-tree
345+
:test-cmds ["clojure -M:test"]}
335346
{:name "depot"
336347
:platforms [:clj]
337348
:note "1 patch required due to using, but not requiring, rewrite-clj.node"
@@ -369,6 +380,7 @@
369380
:test-cmds ["lein test"]}
370381
{:name "mranderson"
371382
:version "0.5.3"
383+
:jdk 11 ;; Downgrade jdk from default, MrAnderson tests currently require the older jdk11
372384
:platforms [:clj]
373385
:github-release {:repo "benedekfazekas/mranderson"
374386
:via :tag
@@ -580,13 +592,18 @@ Specifying no lib-names selects all libraries.")
580592
(when-let [opts (main/doc-arg-opt args-usage args)]
581593
(cond
582594
(get opts "list")
583-
(if (= "json" (get opts "--format"))
584-
(status/line :detail (->> libs
585-
(map (fn [{:keys [name requires]}]
586-
{:lib-name name
587-
:requires (or requires [])}))
588-
json/generate-string))
589-
(status/line :detail (str "available libs: " (string/join " " (map :name libs)))))
595+
(let [format (get opts "--format")
596+
libs-for-ci (->> libs
597+
(map (fn [{:keys [name jdk requires]}]
598+
{:lib-name name
599+
:requires (or requires [])
600+
:jdk (or jdk default-jdk)})))]
601+
(case format
602+
"json"
603+
(status/line :detail (json/generate-string libs-for-ci))
604+
"table"
605+
(status/line :detail (doric/table [:lib-name :jdk :requires] libs-for-ci))
606+
(status/line :detail (str "available libs: " (string/join " " (map :name libs))))))
590607

591608
:else
592609
(let [lib-names (get opts "<lib-name>")

0 commit comments

Comments
 (0)