Skip to content

Commit 1dfb1f6

Browse files
authored
test, build, ci: bump tools & deps (#49)
* ci: bump graalvm * test, build, ci: bump tools & deps * dev: moved clj-kondo lib imports to preferred spot
1 parent 9cbd22d commit 1dfb1f6

File tree

12 files changed

+73
-17
lines changed

12 files changed

+73
-17
lines changed
Lines changed: 5 additions & 0 deletions
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}}}
Lines changed: 51 additions & 0 deletions
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}))

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
uses: actions/setup-java@v4
1414
with:
1515
distribution: 'temurin'
16-
java-version: '17'
16+
java-version: '21'
1717

1818
- name: Setup Babashka
19-
uses: DeLaGuardo/setup-clojure@12.5
19+
uses: DeLaGuardo/setup-clojure@13.1
2020
with:
2121
bb: 'latest'
2222

@@ -45,7 +45,7 @@ jobs:
4545
- 'graalvm'
4646
- 'graalvm-community'
4747
java-version:
48-
- '22.0.2'
48+
- '23.0.2'
4949
steps:
5050
- name: Checkout code
5151
uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
5858
github-token: ${{ secrets.GITHUB_TOKEN }}
5959

6060
- name: Setup Babashka
61-
uses: DeLaGuardo/setup-clojure@12.5
61+
uses: DeLaGuardo/setup-clojure@13.1
6262
with:
6363
bb: 'latest'
6464

@@ -93,7 +93,7 @@ jobs:
9393
uses: actions/checkout@v4
9494

9595
- name: Setup Babashka
96-
uses: DeLaGuardo/setup-clojure@12.5
96+
uses: DeLaGuardo/setup-clojure@13.1
9797
with:
9898
bb: 'latest'
9999

@@ -102,7 +102,7 @@ jobs:
102102
uses: actions/setup-java@v4
103103
with:
104104
distribution: 'temurin'
105-
java-version: '17'
105+
java-version: '21'
106106

107107
- name: Tools versions
108108
run: |

build-helper/deps.edn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{:paths ["src"]
2-
:deps {io.github.clojure/tools.build {:mvn/version "0.10.5"}
3-
babashka/fs {:mvn/version "0.5.21"}}}
2+
:deps {io.github.clojure/tools.build {:mvn/version "0.10.6"}
3+
babashka/fs {:mvn/version "0.5.24"}}}

deps.edn

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
{:deps {org.clojure/clojure {:mvn/version "1.11.3"}}
1+
{:deps {org.clojure/clojure {:mvn/version "1.12.0"}}
22
:paths ["src" "resources"]
33
:aliases
44
{:svm
55
;; this library is "provided"
6-
{:extra-deps {org.graalvm.sdk/nativeimage {:mvn/version "24.0.2"}}}
7-
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.5"}
8-
babashka/fs {:mvn/version "0.5.21"}
6+
{:extra-deps {org.graalvm.sdk/nativeimage {:mvn/version "24.1.2"}}}
7+
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.6"}
8+
babashka/fs {:mvn/version "0.5.24"}
99
babashka/process {:mvn/version "0.5.22"}
1010
slipset/deps-deploy {:mvn/version "0.2.2"}}
1111
:ns-default build}
1212
:uber {:extra-paths ["test"]}
13-
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.08.01"}}
13+
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.01.16"}}
1414
:main-opts ["-m" "clj-kondo.main"]}
1515
:test {:extra-paths ["test"]
1616
:extra-deps {io.github.cognitect-labs/test-runner
1717
{:git/tag "v0.5.1" :git/sha "dfb30dd"}
1818
babashka/process {:mvn/version "0.5.22"}}
1919
:exec-fn cognitect.test-runner.api/test}
20-
:outdated {:deps {org.slf4j/slf4j-simple {:mvn/version "2.0.13"} ;; to rid ourselves of logger warnings
21-
com.github.liquidz/antq {:mvn/version "2.8.1206"}}
20+
:outdated {:deps {org.slf4j/slf4j-simple {:mvn/version "2.0.16"} ;; to rid ourselves of logger warnings
21+
com.github.liquidz/antq {:mvn/version "2.11.1264"}}
2222
:main-opts ["-m" "antq.core"]}}}

0 commit comments

Comments
 (0)