Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .clj-kondo/imports/taoensso/encore/config.edn
Original file line number Diff line number Diff line change
Expand Up @@ -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*}}}
51 changes: 0 additions & 51 deletions .clj-kondo/imports/taoensso/encore/taoensso/encore.clj

This file was deleted.

12 changes: 9 additions & 3 deletions .clj-kondo/imports/taoensso/encore/taoensso/encore_hooks.clj
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,25 @@
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])
[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)
[(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))
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup
uses: ./.github/workflows/shared-setup
with:
jdk: '24'
jdk: '25'

- name: Lint
run: bb lint
Expand All @@ -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 }}

Expand Down
15 changes: 8 additions & 7 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
: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"}
slipset/deps-deploy {:mvn/version "0.2.2"}}
: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"}}
:extra-deps {babashka/fs {:mvn/version "0.5.26"}
: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"
:exclusions [org.slf4j/slf4j-api]}
Expand All @@ -32,11 +32,11 @@
{: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"}}
:override-deps {org.clojure/clojure {:mvn/version "1.12.2"}}
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.09.22"}}
: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"
Expand All @@ -45,5 +45,6 @@
"--exclude=ring/[email protected]" ;; requires jdk 11, we are jdk8 compatible
"--exclude=ring/[email protected]" ;; requires jdk 11, we are jdk8 compatible
"--exclude=ring/[email protected]" ;; requires jdk 11, we are jdk8 compatible
"--exclude=ring/[email protected]" ;; requires jdk 11, we are jdk8 compatible
"--exclude=ring/[email protected]" ;; requires jdk 17, we are jdk8 compatible
"--exclude=ring/[email protected]" ;; requires jdk 17, we are jdk8 compatible
]}}}