Skip to content

Commit 30bb8a1

Browse files
authored
maintenance (#86)
* maint: dev: bump babashka fs * maint: dev: bump clj-kondo * maint: test & dev: bump clojure 12 * maint: dev: supress antq ring-jetty 1.15.x * maint: dev: clj-kondo lib imports * maint: ci: bump jdk 24 to 25
1 parent c7cf308 commit 30bb8a1

File tree

5 files changed

+21
-64
lines changed

5 files changed

+21
-64
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.clj

Lines changed: 0 additions & 51 deletions
This file was deleted.

.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/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup
1919
uses: ./.github/workflows/shared-setup
2020
with:
21-
jdk: '24'
21+
jdk: '25'
2222

2323
- name: Lint
2424
run: bb lint
@@ -30,7 +30,7 @@ jobs:
3030
matrix:
3131
os: [{name: 'windows', shell: 'pwsh'}, {name: 'ubuntu', shell: 'bash'}]
3232
clojure-version: ["1.8", "1.9", "1.10", "1.11", "1.12"]
33-
jdk: ['8', '11', '17', '21', '24']
33+
jdk: ['8', '11', '17', '21', '25']
3434

3535
name: ${{ matrix.os.name }} clj-${{ matrix.clojure-version }} jdk${{ matrix.jdk }}
3636

deps.edn

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
:1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
1010
:1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
1111
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}}
12-
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.2"}}}
12+
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.3"}}}
1313
:build
1414
{:extra-paths ["build"]
1515
:deps {io.github.clojure/tools.build {:mvn/version "0.10.10"}
1616
slipset/deps-deploy {:mvn/version "0.2.2"}}
1717
:ns-default build}
1818
:http-server ;; used for to support integration tests
1919
{:extra-paths ["test" "test-resources"]
20-
:override-deps {org.clojure/clojure {:mvn/version "1.12.2"}}
21-
:extra-deps {babashka/fs {:mvn/version "0.5.26"}
20+
:override-deps {org.clojure/clojure {:mvn/version "1.12.3"}}
21+
:extra-deps {babashka/fs {:mvn/version "0.5.27"}
2222
ring/ring-jetty-adapter {:mvn/version "1.10.0"} ;; stick with version that works on jdk8
2323
ch.qos.logback/logback-classic {:mvn/version "1.3.15"
2424
:exclusions [org.slf4j/slf4j-api]}
@@ -32,11 +32,11 @@
3232
{:git/tag "v0.5.1" :git/sha "dfb30dd"}}
3333
:main-opts ["-m" "cognitect.test-runner"]}
3434
;; for consistent linting we use a specific version of clj-kondo through the jvm
35-
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.07.28"}}
36-
:override-deps {org.clojure/clojure {:mvn/version "1.12.2"}}
35+
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.09.22"}}
36+
:override-deps {org.clojure/clojure {:mvn/version "1.12.3"}}
3737
:main-opts ["-m" "clj-kondo.main"]}
3838
:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1276"}
39-
org.clojure/clojure {:mvn/version "1.12.2"}
39+
org.clojure/clojure {:mvn/version "1.12.3"}
4040
org.slf4j/slf4j-simple {:mvn/version "2.0.17"} ;; to rid ourselves of logger warnings
4141
}
4242
:main-opts ["-m" "antq.core"
@@ -45,5 +45,6 @@
4545
"--exclude=ring/[email protected]" ;; requires jdk 11, we are jdk8 compatible
4646
"--exclude=ring/[email protected]" ;; requires jdk 11, we are jdk8 compatible
4747
"--exclude=ring/[email protected]" ;; requires jdk 11, we are jdk8 compatible
48-
"--exclude=ring/[email protected]" ;; requires jdk 11, we are jdk8 compatible
48+
"--exclude=ring/[email protected]" ;; requires jdk 17, we are jdk8 compatible
49+
"--exclude=ring/[email protected]" ;; requires jdk 17, we are jdk8 compatible
4950
]}}}

0 commit comments

Comments
 (0)