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*}}}
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))
2 changes: 1 addition & 1 deletion .github/workflows/libs-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:

# The runner image comes with a later version gradle that does not work with antq unit tests yet
- name: Install Gradle for antq
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v5
with:
gradle-version: '8.14.3'
if: matrix.lib-name == 'antq'
Expand Down
8 changes: 4 additions & 4 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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"}}}

;;
;; ClojureScript version we test with (and support)
Expand All @@ -35,8 +35,8 @@
:flowstorm
{;; for disabling the official compiler
:classpath-overrides {org.clojure/clojure nil}
:extra-deps {com.github.flow-storm/clojure {:mvn/version "1.12.2"}
com.github.flow-storm/flow-storm-dbg {:mvn/version "4.5.5"}}
:extra-deps {com.github.flow-storm/clojure {:mvn/version "1.12.3-1"}
com.github.flow-storm/flow-storm-dbg {:mvn/version "4.5.7"}}
:jvm-opts ["-Dclojure.storm.instrumentEnable=true"]}

:nrepl/jvm
Expand All @@ -59,7 +59,7 @@
;;
:lint-cache {:replace-paths ["src"]} ;; when building classpath we want to exclude resources
;; so we do not pick up our own clj-kondo config exports
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.09.19"}}
: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"]}

Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"karma-cljs-test": "0.1.0",
"karma-junit-reporter": "2.0.1",
"karma-spec-reporter": "0.0.36",
"shadow-cljs": "3.2.0"
"shadow-cljs": "3.2.1"
}
}
6 changes: 3 additions & 3 deletions script/ci_unit_tests.clj
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"ubuntu"))

;; matrix params to be used on ci
(def ^:private os-jdks {"ubuntu" ["8" "11" "17" "21" "24"]
(def ^:private os-jdks {"ubuntu" ["8" "11" "17" "21" "25"]
;; macOS on GitHub Actions is now arm-based and does not include jdk8
"macos" ["11" "17" "21" "24"]
"windows" ["8" "11" "17" "21" "24"]})
"macos" ["11" "17" "21" "25"]
"windows" ["8" "11" "17" "21" "25"]})
(def ^:private jdk-cljs "21")
(def ^:private jdk-shadow-cljs "21")
(def ^:private all-oses (keys os-jdks))
Expand Down
4 changes: 2 additions & 2 deletions script/test_libs.clj
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
:show-deps-fn cli-deps-tree
:test-cmds ["clojure -T:build ci"]}
{:name "cljfmt"
:version "0.13.3"
:version "0.13.4"
:platforms [:clj :cljs]
:root "cljfmt"
:github-release {:repo "weavejester/cljfmt"
Expand All @@ -325,7 +325,7 @@
:test-cmds ["bb test"]}
{:name "clojure-mcp"
:platforms [:clj]
:version "0.1.9-alpha"
:version "0.1.11-alpha"
:github-release {:repo "bhauman/clojure-mcp"
:via :tag
:version-prefix "v"}
Expand Down
Loading