Skip to content

Commit

Permalink
test, build, ci: bump tools & deps (#49)
Browse files Browse the repository at this point in the history
* ci: bump graalvm

* test, build, ci: bump tools & deps

* dev: moved clj-kondo lib imports to preferred spot
  • Loading branch information
lread authored Jan 21, 2025
1 parent 9cbd22d commit 1dfb1f6
Show file tree
Hide file tree
Showing 12 changed files with 73 additions and 17 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions .clj-kondo/imports/taoensso/encore/config.edn
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{:hooks
{:analyze-call
{taoensso.encore/defalias taoensso.encore/defalias
taoensso.encore/defn-cached taoensso.encore/defn-cached
taoensso.encore/defonce taoensso.encore/defonce}}}
51 changes: 51 additions & 0 deletions .clj-kondo/imports/taoensso/encore/taoensso/encore.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
(ns taoensso.encore
"I don't personally use clj-kondo, so these hooks are
kindly authored and maintained by contributors.
PRs very welcome! - Peter Taoussanis"
(:refer-clojure :exclude [defonce])
(:require
[clj-kondo.hooks-api :as hooks]))

(defn defalias
[{:keys [node]}]
(let [[sym-raw src-raw] (rest (:children node))
src (or src-raw sym-raw)
sym (if src-raw sym-raw (symbol (name (hooks/sexpr src))))]
{:node
(with-meta
(hooks/list-node
[(hooks/token-node 'def)
(hooks/token-node (hooks/sexpr sym))
(hooks/token-node (hooks/sexpr src))])
(meta src))}))

(defn defn-cached
[{:keys [node]}]
(let [[sym _opts binding-vec & body] (rest (:children node))]
{:node
(hooks/list-node
(list
(hooks/token-node 'def)
sym
(hooks/list-node
(list*
(hooks/token-node 'fn)
binding-vec
body))))}))

(defn defonce
[{:keys [node]}]
;; 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)
sym+meta
init-expr])]

{:node rewritten}))
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'

- name: Setup Babashka
uses: DeLaGuardo/setup-clojure@12.5
uses: DeLaGuardo/setup-clojure@13.1
with:
bb: 'latest'

Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
- 'graalvm'
- 'graalvm-community'
java-version:
- '22.0.2'
- '23.0.2'
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -58,7 +58,7 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Babashka
uses: DeLaGuardo/setup-clojure@12.5
uses: DeLaGuardo/setup-clojure@13.1
with:
bb: 'latest'

Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Babashka
uses: DeLaGuardo/setup-clojure@12.5
uses: DeLaGuardo/setup-clojure@13.1
with:
bb: 'latest'

Expand All @@ -102,7 +102,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'

- name: Tools versions
run: |
Expand Down
4 changes: 2 additions & 2 deletions build-helper/deps.edn
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{:paths ["src"]
:deps {io.github.clojure/tools.build {:mvn/version "0.10.5"}
babashka/fs {:mvn/version "0.5.21"}}}
:deps {io.github.clojure/tools.build {:mvn/version "0.10.6"}
babashka/fs {:mvn/version "0.5.24"}}}
14 changes: 7 additions & 7 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{:deps {org.clojure/clojure {:mvn/version "1.11.3"}}
{:deps {org.clojure/clojure {:mvn/version "1.12.0"}}
:paths ["src" "resources"]
:aliases
{:svm
;; this library is "provided"
{:extra-deps {org.graalvm.sdk/nativeimage {:mvn/version "24.0.2"}}}
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.5"}
babashka/fs {:mvn/version "0.5.21"}
{:extra-deps {org.graalvm.sdk/nativeimage {:mvn/version "24.1.2"}}}
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.6"}
babashka/fs {:mvn/version "0.5.24"}
babashka/process {:mvn/version "0.5.22"}
slipset/deps-deploy {:mvn/version "0.2.2"}}
:ns-default build}
:uber {:extra-paths ["test"]}
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.08.01"}}
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.01.16"}}
:main-opts ["-m" "clj-kondo.main"]}
:test {:extra-paths ["test"]
:extra-deps {io.github.cognitect-labs/test-runner
{:git/tag "v0.5.1" :git/sha "dfb30dd"}
babashka/process {:mvn/version "0.5.22"}}
:exec-fn cognitect.test-runner.api/test}
:outdated {:deps {org.slf4j/slf4j-simple {:mvn/version "2.0.13"} ;; to rid ourselves of logger warnings
com.github.liquidz/antq {:mvn/version "2.8.1206"}}
:outdated {:deps {org.slf4j/slf4j-simple {:mvn/version "2.0.16"} ;; to rid ourselves of logger warnings
com.github.liquidz/antq {:mvn/version "2.11.1264"}}
:main-opts ["-m" "antq.core"]}}}
2 changes: 1 addition & 1 deletion test-hello-world/deps.edn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{:paths ["src"]
:deps {org.clojure/clojure {:mvn/version "1.11.3"}
:deps {org.clojure/clojure {:mvn/version "1.12.0"}
lib1/lib1 {:local/root "lib1/target/lib1.jar"}
lib2/lib2 {:local/root "lib2/target/lib2.jar"}
clj-easy/graal-build-time {:local/root "target/graal-build-time.jar"}}
Expand Down
2 changes: 1 addition & 1 deletion test-single-segment/deps.edn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{:deps {org.clojure/clojure {:mvn/version "1.11.3"}
{:deps {org.clojure/clojure {:mvn/version "1.12.0"}
org.clj-commons/digest {:mvn/version "1.4.100"}
clj-easy/graal-build-time {:local/root "target/graal-build-time.jar"}}
:aliases {:build {:deps {clj-easy/build-helper {:local/root "../build-helper"}}
Expand Down

0 comments on commit 1dfb1f6

Please sign in to comment.