Skip to content

Commit 7645928

Browse files
authored
test & ci: bump deps (#81)
Of note: - bumping kondo uncovered redundant nested str call in script, fixed! - moved clj-kondo imports from the legacy .clj-kondo/ dir to current recommended .clj-kondo/imports dir - added jdk24 to ci test matrix
1 parent 742f267 commit 7645928

File tree

14 files changed

+72
-33
lines changed

14 files changed

+72
-33
lines changed
File renamed without changes.

Diff for: .clj-kondo/imports/taoensso/encore/config.edn

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{:hooks
2+
{:analyze-call
3+
{taoensso.encore/defalias taoensso.encore/defalias
4+
taoensso.encore/defn-cached taoensso.encore/defn-cached
5+
taoensso.encore/defonce taoensso.encore/defonce}}}
+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
(ns taoensso.encore
2+
"I don't personally use clj-kondo, so these hooks are
3+
kindly authored and maintained by contributors.
4+
PRs very welcome! - Peter Taoussanis"
5+
(:refer-clojure :exclude [defonce])
6+
(:require
7+
[clj-kondo.hooks-api :as hooks]))
8+
9+
(defn defalias
10+
[{:keys [node]}]
11+
(let [[sym-raw src-raw] (rest (:children node))
12+
src (or src-raw sym-raw)
13+
sym (if src-raw sym-raw (symbol (name (hooks/sexpr src))))]
14+
{:node
15+
(with-meta
16+
(hooks/list-node
17+
[(hooks/token-node 'def)
18+
(hooks/token-node (hooks/sexpr sym))
19+
(hooks/token-node (hooks/sexpr src))])
20+
(meta src))}))
21+
22+
(defn defn-cached
23+
[{:keys [node]}]
24+
(let [[sym _opts binding-vec & body] (rest (:children node))]
25+
{:node
26+
(hooks/list-node
27+
(list
28+
(hooks/token-node 'def)
29+
sym
30+
(hooks/list-node
31+
(list*
32+
(hooks/token-node 'fn)
33+
binding-vec
34+
body))))}))
35+
36+
(defn defonce
37+
[{:keys [node]}]
38+
;; args = [sym doc-string? attr-map? init-expr]
39+
(let [[sym & args] (rest (:children node))
40+
[doc-string args] (if (and (hooks/string-node? (first args)) (next args)) [(hooks/sexpr (first args)) (next args)] [nil args])
41+
[attr-map init-expr] (if (and (hooks/map-node? (first args)) (next args)) [(hooks/sexpr (first args)) (fnext args)] [nil (first args)])
42+
43+
attr-map (if doc-string (assoc attr-map :doc doc-string) attr-map)
44+
sym+meta (if attr-map (with-meta sym attr-map) sym)
45+
rewritten
46+
(hooks/list-node
47+
[(hooks/token-node 'clojure.core/defonce)
48+
sym+meta
49+
init-expr])]
50+
51+
{:node rewritten}))

Diff for: .clj-kondo/taoensso/encore/config.edn

-1
This file was deleted.

Diff for: .clj-kondo/taoensso/encore/taoensso/encore.clj

-16
This file was deleted.

Diff for: .github/workflows/shared-setup/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ runs:
3030
java-version: ${{ inputs.jdk }}
3131

3232
- name: Install Clojure Tools
33-
uses: DeLaGuardo/setup-clojure@12.5
33+
uses: DeLaGuardo/setup-clojure@13.2
3434
with:
3535
cli: 'latest'
3636
bb: 'latest'

Diff for: .github/workflows/tests.yml

+2-2
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: '11'
21+
jdk: '24'
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']
33+
jdk: ['8', '11', '17', '21', '24']
3434

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

Diff for: bb.edn

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
:task publish/-main}
4646
neil ;; let's not rely on a random version of neil
4747
{:doc "Pinned version of babashka/neil (used in scripting)"
48-
:extra-deps {io.github.babashka/neil {:git/tag "v0.3.67" :git/sha "054ca51"}}
48+
:extra-deps {io.github.babashka/neil {:git/tag "v0.3.68" :git/sha "78ffab1"}}
4949
:task babashka.neil/-main}
5050
;; hidden tasks, no need for folks to be trying these ci invoked tasks
5151
-ci-clojars-deploy

Diff for: deps.edn

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,32 @@
1212
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}}
1313
:build
1414
{:extra-paths ["build"]
15-
:deps {io.github.clojure/tools.build {:mvn/version "0.10.5"}
15+
:deps {io.github.clojure/tools.build {:mvn/version "0.10.8"}
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"]
2020
:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}
21-
:extra-deps {babashka/fs {:mvn/version "0.5.22"}
21+
:extra-deps {babashka/fs {:mvn/version "0.5.24"}
2222
ring/ring-jetty-adapter {:mvn/version "1.10.0"} ;; stick with version that works on jdk8
23-
ch.qos.logback/logback-classic {:mvn/version "1.3.14"
23+
ch.qos.logback/logback-classic {:mvn/version "1.3.15"
2424
:exclusions [org.slf4j/slf4j-api]}
25-
org.slf4j/jcl-over-slf4j {:mvn/version "2.0.16"}
26-
org.slf4j/jul-to-slf4j {:mvn/version "2.0.16"}
27-
org.slf4j/log4j-over-slf4j {:mvn/version "2.0.16"}}
25+
org.slf4j/jcl-over-slf4j {:mvn/version "2.0.17"}
26+
org.slf4j/jul-to-slf4j {:mvn/version "2.0.17"}
27+
org.slf4j/log4j-over-slf4j {:mvn/version "2.0.17"}}
2828
:exec-fn clj-http.lite.test-util.http-server/run}
2929
:test
3030
{:extra-paths ["test"]
3131
:extra-deps {io.github.cognitect-labs/test-runner
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 "2024.08.29"}}
35+
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.02.20"}}
3636
:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}
3737
:main-opts ["-m" "clj-kondo.main"]}
38-
:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.9.1221"}
39-
org.clojure/clojure {:mvn/version "1.11.3"}
40-
org.slf4j/slf4j-simple {:mvn/version "2.0.16"} ;; to rid ourselves of logger warnings
38+
:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1276"}
39+
org.clojure/clojure {:mvn/version "1.12.0"}
40+
org.slf4j/slf4j-simple {:mvn/version "2.0.17"} ;; to rid ourselves of logger warnings
4141
}
4242
:main-opts ["-m" "antq.core"
4343
"--exclude=ch.qos.logback/[email protected]" ;; requires min jdk 11, we are jdk8 compatible

Diff for: script/publish.clj

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@
141141
;; followed by any attributes
142142
"$1"
143143
;; followed by datestamp (local time is fine)
144-
(str " - " (yyyy-mm-dd-now-utc))
144+
" - " (yyyy-mm-dd-now-utc)
145145
;; followed by an AsciiDoc anchor for easy referencing
146-
(str " [[v" version "]]")
146+
" [[v" version "]]"
147147
;; followed by section content
148148
"$2"
149149
;; followed by link to commit log

0 commit comments

Comments
 (0)