Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test & ci: bump deps #81

Merged
merged 1 commit into from
Mar 26, 2025
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
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}))
1 change: 0 additions & 1 deletion .clj-kondo/taoensso/encore/config.edn

This file was deleted.

16 changes: 0 additions & 16 deletions .clj-kondo/taoensso/encore/taoensso/encore.clj

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/shared-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ runs:
java-version: ${{ inputs.jdk }}

- name: Install Clojure Tools
uses: DeLaGuardo/setup-clojure@12.5
uses: DeLaGuardo/setup-clojure@13.2
with:
cli: 'latest'
bb: 'latest'
Expand Down
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: '11'
jdk: '24'

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

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

Expand Down
2 changes: 1 addition & 1 deletion bb.edn
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
:task publish/-main}
neil ;; let's not rely on a random version of neil
{:doc "Pinned version of babashka/neil (used in scripting)"
:extra-deps {io.github.babashka/neil {:git/tag "v0.3.67" :git/sha "054ca51"}}
:extra-deps {io.github.babashka/neil {:git/tag "v0.3.68" :git/sha "78ffab1"}}
:task babashka.neil/-main}
;; hidden tasks, no need for folks to be trying these ci invoked tasks
-ci-clojars-deploy
Expand Down
20 changes: 10 additions & 10 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,32 @@
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}}
:build
{:extra-paths ["build"]
:deps {io.github.clojure/tools.build {:mvn/version "0.10.5"}
:deps {io.github.clojure/tools.build {:mvn/version "0.10.8"}
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.11.3"}}
:extra-deps {babashka/fs {:mvn/version "0.5.22"}
:extra-deps {babashka/fs {:mvn/version "0.5.24"}
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.14"
ch.qos.logback/logback-classic {:mvn/version "1.3.15"
:exclusions [org.slf4j/slf4j-api]}
org.slf4j/jcl-over-slf4j {:mvn/version "2.0.16"}
org.slf4j/jul-to-slf4j {:mvn/version "2.0.16"}
org.slf4j/log4j-over-slf4j {:mvn/version "2.0.16"}}
org.slf4j/jcl-over-slf4j {:mvn/version "2.0.17"}
org.slf4j/jul-to-slf4j {:mvn/version "2.0.17"}
org.slf4j/log4j-over-slf4j {:mvn/version "2.0.17"}}
:exec-fn clj-http.lite.test-util.http-server/run}
:test
{:extra-paths ["test"]
:extra-deps {io.github.cognitect-labs/test-runner
{: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 "2024.08.29"}}
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.02.20"}}
:override-deps {org.clojure/clojure {:mvn/version "1.11.3"}}
:main-opts ["-m" "clj-kondo.main"]}
:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.9.1221"}
org.clojure/clojure {:mvn/version "1.11.3"}
org.slf4j/slf4j-simple {:mvn/version "2.0.16"} ;; to rid ourselves of logger warnings
:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1276"}
org.clojure/clojure {:mvn/version "1.12.0"}
org.slf4j/slf4j-simple {:mvn/version "2.0.17"} ;; to rid ourselves of logger warnings
}
:main-opts ["-m" "antq.core"
"--exclude=ch.qos.logback/[email protected]" ;; requires min jdk 11, we are jdk8 compatible
Expand Down
4 changes: 2 additions & 2 deletions script/publish.clj
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@
;; followed by any attributes
"$1"
;; followed by datestamp (local time is fine)
(str " - " (yyyy-mm-dd-now-utc))
" - " (yyyy-mm-dd-now-utc)
;; followed by an AsciiDoc anchor for easy referencing
(str " [[v" version "]]")
" [[v" version "]]"
;; followed by section content
"$2"
;; followed by link to commit log
Expand Down