Skip to content

Commit 25d8091

Browse files
authored
maintenance (#408)
* maint: ci: bump setup-gradle * maint: dev: bump clj-kondo * maint: dev: bump flow storm deps * maint: test: bump clojure 12 * maint: test: bump shadow-cljs * maint: test-libs: bump cljfmt, clojure-mcp * maint: ci matrix: bump jdk 24 to 25
1 parent 1343d2b commit 25d8091

File tree

8 files changed

+26
-19
lines changed

8 files changed

+26
-19
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
{taoensso.encore/defalias taoensso.encore-hooks/defalias
44
taoensso.encore/defaliases taoensso.encore-hooks/defaliases
55
taoensso.encore/defn-cached taoensso.encore-hooks/defn-cached
6-
taoensso.encore/defonce taoensso.encore-hooks/defonce}}}
6+
taoensso.encore/defonce taoensso.encore-hooks/defonce
7+
taoensso.encore/def* taoensso.encore-hooks/def*}}}

.clj-kondo/imports/taoensso/encore/taoensso/encore_hooks.clj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,25 @@
6464
binding-vec
6565
body))))}))
6666

67-
(defn defonce
68-
[{:keys [node]}]
67+
(defn -def-impl
68+
[{:keys [node]} core-macro-sym]
6969
;; args = [sym doc-string? attr-map? init-expr]
7070
(let [[sym & args] (rest (:children node))
7171
[doc-string args] (if (and (hooks/string-node? (first args)) (next args)) [(hooks/sexpr (first args)) (next args)] [nil args])
7272
[attr-map init-expr] (if (and (hooks/map-node? (first args)) (next args)) [(hooks/sexpr (first args)) (fnext args)] [nil (first args)])
7373

7474
attr-map (if doc-string (assoc attr-map :doc doc-string) attr-map)
7575
sym+meta (if attr-map (with-meta sym attr-map) sym)
76+
7677
rewritten
7778
(hooks/list-node
78-
[(hooks/token-node 'clojure.core/defonce)
79+
[(hooks/token-node core-macro-sym)
7980
sym+meta
8081
init-expr])]
8182

83+
#_(println "old node:" node)
84+
#_(println "new node:" rewritten)
8285
{:node rewritten}))
86+
87+
(defn def* [arg] (-def-impl arg 'def))
88+
(defn defonce [arg] (-def-impl arg 'clojure.core/defonce))

.github/workflows/libs-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
# The runner image comes with a later version gradle that does not work with antq unit tests yet
6565
- name: Install Gradle for antq
66-
uses: gradle/actions/setup-gradle@v4
66+
uses: gradle/actions/setup-gradle@v5
6767
with:
6868
gradle-version: '8.14.3'
6969
if: matrix.lib-name == 'antq'

deps.edn

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
:1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
1818
:1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
1919
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}}
20-
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.2"}}}
20+
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.3"}}}
2121

2222
;;
2323
;; ClojureScript version we test with (and support)
@@ -35,8 +35,8 @@
3535
:flowstorm
3636
{;; for disabling the official compiler
3737
:classpath-overrides {org.clojure/clojure nil}
38-
:extra-deps {com.github.flow-storm/clojure {:mvn/version "1.12.2"}
39-
com.github.flow-storm/flow-storm-dbg {:mvn/version "4.5.5"}}
38+
:extra-deps {com.github.flow-storm/clojure {:mvn/version "1.12.3-1"}
39+
com.github.flow-storm/flow-storm-dbg {:mvn/version "4.5.7"}}
4040
:jvm-opts ["-Dclojure.storm.instrumentEnable=true"]}
4141

4242
:nrepl/jvm
@@ -59,7 +59,7 @@
5959
;;
6060
:lint-cache {:replace-paths ["src"]} ;; when building classpath we want to exclude resources
6161
;; so we do not pick up our own clj-kondo config exports
62-
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.09.19"}}
62+
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.09.22"}}
6363
:override-deps {org.clojure/clojure {:mvn/version "1.12.2"}}
6464
:main-opts ["-m" "clj-kondo.main"]}
6565

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"karma-cljs-test": "0.1.0",
77
"karma-junit-reporter": "2.0.1",
88
"karma-spec-reporter": "0.0.36",
9-
"shadow-cljs": "3.2.0"
9+
"shadow-cljs": "3.2.1"
1010
}
1111
}

script/ci_unit_tests.clj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"ubuntu"))
2020

2121
;; matrix params to be used on ci
22-
(def ^:private os-jdks {"ubuntu" ["8" "11" "17" "21" "24"]
22+
(def ^:private os-jdks {"ubuntu" ["8" "11" "17" "21" "25"]
2323
;; macOS on GitHub Actions is now arm-based and does not include jdk8
24-
"macos" ["11" "17" "21" "24"]
25-
"windows" ["8" "11" "17" "21" "24"]})
24+
"macos" ["11" "17" "21" "25"]
25+
"windows" ["8" "11" "17" "21" "25"]})
2626
(def ^:private jdk-cljs "21")
2727
(def ^:private jdk-shadow-cljs "21")
2828
(def ^:private all-oses (keys os-jdks))

script/test_libs.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@
299299
:show-deps-fn cli-deps-tree
300300
:test-cmds ["clojure -T:build ci"]}
301301
{:name "cljfmt"
302-
:version "0.13.3"
302+
:version "0.13.4"
303303
:platforms [:clj :cljs]
304304
:root "cljfmt"
305305
:github-release {:repo "weavejester/cljfmt"
@@ -325,7 +325,7 @@
325325
:test-cmds ["bb test"]}
326326
{:name "clojure-mcp"
327327
:platforms [:clj]
328-
:version "0.1.9-alpha"
328+
:version "0.1.11-alpha"
329329
:github-release {:repo "bhauman/clojure-mcp"
330330
:via :tag
331331
:version-prefix "v"}

0 commit comments

Comments
 (0)