From 3a4f5a9db6ba1be30b1405f2d63ae4f7316febef Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 6 Oct 2025 10:54:46 -0400 Subject: [PATCH 1/6] maint: dev: bump babashka fs --- deps.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index 92e2769d..85bb4f50 100644 --- a/deps.edn +++ b/deps.edn @@ -18,7 +18,7 @@ :http-server ;; used for to support integration tests {:extra-paths ["test" "test-resources"] :override-deps {org.clojure/clojure {:mvn/version "1.12.2"}} - :extra-deps {babashka/fs {:mvn/version "0.5.26"} + :extra-deps {babashka/fs {:mvn/version "0.5.27"} ring/ring-jetty-adapter {:mvn/version "1.10.0"} ;; stick with version that works on jdk8 ch.qos.logback/logback-classic {:mvn/version "1.3.15" :exclusions [org.slf4j/slf4j-api]} From d14c77f78328ebf4fc0625da706b454659284c32 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 6 Oct 2025 10:55:23 -0400 Subject: [PATCH 2/6] maint: dev: bump clj-kondo --- deps.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index 85bb4f50..cd2126d4 100644 --- a/deps.edn +++ b/deps.edn @@ -32,7 +32,7 @@ {:git/tag "v0.5.1" :git/sha "dfb30dd"}} :main-opts ["-m" "cognitect.test-runner"]} ;; for consistent linting we use a specific version of clj-kondo through the jvm - :clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.07.28"}} + :clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.09.22"}} :override-deps {org.clojure/clojure {:mvn/version "1.12.2"}} :main-opts ["-m" "clj-kondo.main"]} :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1276"} From 107404175d43a39bf3f0f3f0b5c3c127d0ac7b77 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 6 Oct 2025 10:56:49 -0400 Subject: [PATCH 3/6] maint: test & dev: bump clojure 12 --- deps.edn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps.edn b/deps.edn index cd2126d4..f6badee3 100644 --- a/deps.edn +++ b/deps.edn @@ -9,7 +9,7 @@ :1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}} :1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}} :1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}} - :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.2"}}} + :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.3"}}} :build {:extra-paths ["build"] :deps {io.github.clojure/tools.build {:mvn/version "0.10.10"} @@ -17,7 +17,7 @@ :ns-default build} :http-server ;; used for to support integration tests {:extra-paths ["test" "test-resources"] - :override-deps {org.clojure/clojure {:mvn/version "1.12.2"}} + :override-deps {org.clojure/clojure {:mvn/version "1.12.3"}} :extra-deps {babashka/fs {:mvn/version "0.5.27"} ring/ring-jetty-adapter {:mvn/version "1.10.0"} ;; stick with version that works on jdk8 ch.qos.logback/logback-classic {:mvn/version "1.3.15" @@ -33,10 +33,10 @@ :main-opts ["-m" "cognitect.test-runner"]} ;; for consistent linting we use a specific version of clj-kondo through the jvm :clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.09.22"}} - :override-deps {org.clojure/clojure {:mvn/version "1.12.2"}} + :override-deps {org.clojure/clojure {:mvn/version "1.12.3"}} :main-opts ["-m" "clj-kondo.main"]} :outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1276"} - org.clojure/clojure {:mvn/version "1.12.2"} + org.clojure/clojure {:mvn/version "1.12.3"} org.slf4j/slf4j-simple {:mvn/version "2.0.17"} ;; to rid ourselves of logger warnings } :main-opts ["-m" "antq.core" From 925afe0aac5ff5eb60472266574597d5391251b4 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 6 Oct 2025 10:57:20 -0400 Subject: [PATCH 4/6] maint: dev: supress antq ring-jetty 1.15.x --- deps.edn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index f6badee3..3e9a4559 100644 --- a/deps.edn +++ b/deps.edn @@ -45,5 +45,6 @@ "--exclude=ring/ring-jetty-adapter@1.11.x" ;; requires jdk 11, we are jdk8 compatible "--exclude=ring/ring-jetty-adapter@1.12.x" ;; requires jdk 11, we are jdk8 compatible "--exclude=ring/ring-jetty-adapter@1.13.x" ;; requires jdk 11, we are jdk8 compatible - "--exclude=ring/ring-jetty-adapter@1.14.x" ;; requires jdk 11, we are jdk8 compatible + "--exclude=ring/ring-jetty-adapter@1.14.x" ;; requires jdk 17, we are jdk8 compatible + "--exclude=ring/ring-jetty-adapter@1.15.x" ;; requires jdk 17, we are jdk8 compatible ]}}} From ea480b07b830adafb3ea2c2a92cd388a5f368ee4 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 6 Oct 2025 11:07:02 -0400 Subject: [PATCH 5/6] maint: dev: clj-kondo lib imports --- .clj-kondo/imports/taoensso/encore/config.edn | 3 +- .../taoensso/encore/taoensso/encore.clj | 51 ------------------- .../taoensso/encore/taoensso/encore_hooks.clj | 12 +++-- 3 files changed, 11 insertions(+), 55 deletions(-) delete mode 100644 .clj-kondo/imports/taoensso/encore/taoensso/encore.clj diff --git a/.clj-kondo/imports/taoensso/encore/config.edn b/.clj-kondo/imports/taoensso/encore/config.edn index 487e2331..975c943a 100644 --- a/.clj-kondo/imports/taoensso/encore/config.edn +++ b/.clj-kondo/imports/taoensso/encore/config.edn @@ -3,4 +3,5 @@ {taoensso.encore/defalias taoensso.encore-hooks/defalias taoensso.encore/defaliases taoensso.encore-hooks/defaliases taoensso.encore/defn-cached taoensso.encore-hooks/defn-cached - taoensso.encore/defonce taoensso.encore-hooks/defonce}}} + taoensso.encore/defonce taoensso.encore-hooks/defonce + taoensso.encore/def* taoensso.encore-hooks/def*}}} diff --git a/.clj-kondo/imports/taoensso/encore/taoensso/encore.clj b/.clj-kondo/imports/taoensso/encore/taoensso/encore.clj deleted file mode 100644 index 5af6de91..00000000 --- a/.clj-kondo/imports/taoensso/encore/taoensso/encore.clj +++ /dev/null @@ -1,51 +0,0 @@ -(ns taoensso.encore - "I don't personally use clj-kondo, so these hooks are - kindly authored and maintained by contributors. - PRs very welcome! - Peter Taoussanis" - (:refer-clojure :exclude [defonce]) - (:require - [clj-kondo.hooks-api :as hooks])) - -(defn defalias - [{:keys [node]}] - (let [[sym-raw src-raw] (rest (:children node)) - src (or 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))})) - -(defn defn-cached - [{:keys [node]}] - (let [[sym _opts binding-vec & body] (rest (:children node))] - {:node - (hooks/list-node - (list - (hooks/token-node 'def) - sym - (hooks/list-node - (list* - (hooks/token-node 'fn) - binding-vec - body))))})) - -(defn defonce - [{:keys [node]}] - ;; args = [sym doc-string? attr-map? init-expr] - (let [[sym & args] (rest (:children node)) - [doc-string args] (if (and (hooks/string-node? (first args)) (next args)) [(hooks/sexpr (first args)) (next args)] [nil args]) - [attr-map init-expr] (if (and (hooks/map-node? (first args)) (next args)) [(hooks/sexpr (first args)) (fnext args)] [nil (first args)]) - - attr-map (if doc-string (assoc attr-map :doc doc-string) attr-map) - sym+meta (if attr-map (with-meta sym attr-map) sym) - rewritten - (hooks/list-node - [(hooks/token-node 'clojure.core/defonce) - sym+meta - init-expr])] - - {:node rewritten})) diff --git a/.clj-kondo/imports/taoensso/encore/taoensso/encore_hooks.clj b/.clj-kondo/imports/taoensso/encore/taoensso/encore_hooks.clj index a574107f..d133f73e 100644 --- a/.clj-kondo/imports/taoensso/encore/taoensso/encore_hooks.clj +++ b/.clj-kondo/imports/taoensso/encore/taoensso/encore_hooks.clj @@ -64,8 +64,8 @@ binding-vec body))))})) -(defn defonce - [{:keys [node]}] +(defn -def-impl + [{:keys [node]} core-macro-sym] ;; args = [sym doc-string? attr-map? init-expr] (let [[sym & args] (rest (:children node)) [doc-string args] (if (and (hooks/string-node? (first args)) (next args)) [(hooks/sexpr (first args)) (next args)] [nil args]) @@ -73,10 +73,16 @@ attr-map (if doc-string (assoc attr-map :doc doc-string) attr-map) sym+meta (if attr-map (with-meta sym attr-map) sym) + rewritten (hooks/list-node - [(hooks/token-node 'clojure.core/defonce) + [(hooks/token-node core-macro-sym) sym+meta init-expr])] + #_(println "old node:" node) + #_(println "new node:" rewritten) {:node rewritten})) + +(defn def* [arg] (-def-impl arg 'def)) +(defn defonce [arg] (-def-impl arg 'clojure.core/defonce)) From 43ef10b3bdeaf8bae549bb33986eb4b883797745 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 6 Oct 2025 11:09:15 -0400 Subject: [PATCH 6/6] maint: ci: bump jdk 24 to 25 --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4b34ee71..a38f379e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: - name: Setup uses: ./.github/workflows/shared-setup with: - jdk: '24' + jdk: '25' - name: Lint run: bb lint @@ -30,7 +30,7 @@ jobs: matrix: os: [{name: 'windows', shell: 'pwsh'}, {name: 'ubuntu', shell: 'bash'}] clojure-version: ["1.8", "1.9", "1.10", "1.11", "1.12"] - jdk: ['8', '11', '17', '21', '24'] + jdk: ['8', '11', '17', '21', '25'] name: ${{ matrix.os.name }} clj-${{ matrix.clojure-version }} jdk${{ matrix.jdk }}