Skip to content

Commit 0bf49a1

Browse files
lreadlread
committed
maint: bump deps to current
Of note: - address new clj-kondo findings (dynamic tests vars were uninitialized).
1 parent 38a9466 commit 0bf49a1

File tree

8 files changed

+61
-38
lines changed

8 files changed

+61
-38
lines changed

‎.clj-kondo/http-kit/http-kit/config.edn

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
{:hooks
3+
{:analyze-call {org.httpkit.server/with-channel httpkit.with-channel/with-channel}}}

‎.clj-kondo/http-kit/http-kit/httpkit/with_channel.clj

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
(ns httpkit.with-channel
2+
(:require [clj-kondo.hooks-api :as api]))
3+
4+
(defn with-channel [{node :node}]
5+
(let [[request channel & body] (rest (:children node))]
6+
(when-not (and request channel) (throw (ex-info "No request or channel provided" {})))
7+
(when-not (api/token-node? channel) (throw (ex-info "Missing channel argument" {})))
8+
(let [new-node
9+
(api/list-node
10+
(list*
11+
(api/token-node 'let)
12+
(api/vector-node [channel (api/vector-node [])])
13+
request
14+
body))]
15+
16+
{:node new-node})))

‎.github/workflows/release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313

1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
with:
1818
fetch-depth: 0
1919

2020
- name: Setup Git User so that we can later commit
2121
uses: fregante/[email protected]
2222

2323
- name: Clojure deps cache
24-
uses: actions/cache@v3
24+
uses: actions/cache@v4
2525
with:
2626
path: |
2727
~/.m2/repository
@@ -31,13 +31,13 @@ jobs:
3131
restore-keys: cljdeps-
3232

3333
- name: Setup Java
34-
uses: actions/setup-java@v3
34+
uses: actions/setup-java@v4
3535
with:
3636
distribution: 'temurin'
3737
java-version: '11'
3838

3939
- name: Install Clojure Tools
40-
uses: DeLaGuardo/setup-clojure@10.3
40+
uses: DeLaGuardo/setup-clojure@12.5
4141
with:
4242
bb: 'latest'
4343

‎.github/workflows/test.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
tests: ${{ steps.set-tests.outputs.tests }}
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Clojure deps cache
16-
uses: actions/cache@v3
16+
uses: actions/cache@v4
1717
with:
1818
path: |
1919
~/.m2/repository
@@ -23,13 +23,13 @@ jobs:
2323
restore-keys: cljdeps-
2424

2525
- name: "Setup Java"
26-
uses: actions/setup-java@v3
26+
uses: actions/setup-java@v4
2727
with:
2828
distribution: 'temurin'
2929
java-version: '11'
3030

3131
- name: Install Clojure Tools
32-
uses: DeLaGuardo/setup-clojure@10.3
32+
uses: DeLaGuardo/setup-clojure@12.5
3333
with:
3434
bb: 'latest'
3535

@@ -71,10 +71,10 @@ jobs:
7171
if: ${{ matrix.os == 'ubuntu' }}
7272
run: sudo apt-get -y install fluxbox
7373

74-
- uses: actions/checkout@v3
74+
- uses: actions/checkout@v4
7575

7676
- name: Clojure deps cache
77-
uses: actions/cache@v3
77+
uses: actions/cache@v4
7878
with:
7979
path: |
8080
~/.m2/repository
@@ -84,13 +84,13 @@ jobs:
8484
restore-keys: cljdeps-
8585

8686
- name: Setup Java
87-
uses: actions/setup-java@v3
87+
uses: actions/setup-java@v4
8888
with:
8989
distribution: 'temurin'
9090
java-version: '11'
9191

9292
- name: Install Clojure Tools
93-
uses: DeLaGuardo/setup-clojure@10.3
93+
uses: DeLaGuardo/setup-clojure@12.5
9494
with:
9595
bb: 'latest'
9696

‎deps.edn

+24-20
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
{:paths ["src" "resources"]
22
:deps {org.clojure/clojure {:mvn/version "1.9.0"} ;; min clojure version
3-
babashka/fs {:mvn/version "0.3.17"}
4-
babashka/process {:mvn/version "0.4.16"}
3+
babashka/fs {:mvn/version "0.5.20"}
4+
babashka/process {:mvn/version "0.5.22"}
55
clj-http/clj-http {:mvn/version "3.12.3"} ;; for jvm use
66
org.clj-commons/clj-http-lite {:mvn/version "1.0.13"} ;; for babashka use
77
slingshot/slingshot {:mvn/version "0.12.2"}
8-
cheshire/cheshire {:mvn/version "5.11.0"}
9-
org.clojure/tools.cli {:mvn/version "1.0.214"}
10-
org.clojure/tools.logging {:mvn/version "1.2.4"}}
8+
cheshire/cheshire {:mvn/version "5.12.0"}
9+
org.clojure/tools.cli {:mvn/version "1.1.230"}
10+
org.clojure/tools.logging {:mvn/version "1.3.0"}}
1111
:aliases
12-
{:1.11 {:replace-deps {org.clojure/clojure {:mvn/version "1.11.1"}}}
12+
{:1.11 {:replace-deps {org.clojure/clojure {:mvn/version "1.11.2"}}}
13+
:1.12 {:replace-deps {org.clojure/clojure {:mvn/version "1.12.0-alpha9"}}}
1314
:debug {:extra-paths ["env/dev/resources"]}
1415
:test {:extra-paths ["test" "env/test/resources"]
1516
:extra-deps {io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"}
16-
org.babashka/cli {:mvn/version "0.7.51"}
17-
ch.qos.logback/logback-classic {:mvn/version "1.4.7"}
17+
org.babashka/cli {:mvn/version "0.8.58"}
18+
ch.qos.logback/logback-classic {:mvn/version "1.3.14"}
1819
;; for http-client which uses apache http client 4.x which uses commons logging
19-
org.slf4j/jcl-over-slf4j {:mvn/version "2.0.7"}}
20+
org.slf4j/jcl-over-slf4j {:mvn/version "2.0.12"}}
2021
:exec-fn cognitect.test-runner.api/test
2122
:org.babashka/cli {:coerce {:nses [:symbol]
2223
:patterns [:string]
@@ -25,15 +26,15 @@
2526
:script {:extra-paths ["script"]}
2627

2728
;; test-doc-blocks - gen tests
28-
:test-doc-blocks {:replace-deps {org.clojure/clojure {:mvn/version "1.11.1"}
29+
:test-doc-blocks {:replace-deps {org.clojure/clojure {:mvn/version "1.11.2"}
2930
com.github.lread/test-doc-blocks {:mvn/version "1.0.166-alpha"}}
3031
:replace-paths []
3132
:ns-default lread.test-doc-blocks
3233
:exec-args {:docs ["doc/01-user-guide.adoc"]}}
3334

3435
;; test-doc-blocks - run tests
3536
;; usage: test:test-docs
36-
:test-docs {:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
37+
:test-docs {:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
3738
:extra-paths ["target/test-doc-blocks/test"]
3839
:exec-fn cognitect.test-runner.api/test
3940
:exec-args {:dirs ["target/test-doc-blocks/test"]}
@@ -43,23 +44,26 @@
4344
:main-opts ["-m" "babashka.cli.exec"]}
4445

4546
;; for consistent linting we use a specific version of clj-kondo through the jvm
46-
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2023.04.14"}}
47+
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.03.13"}}
4748
:main-opts ["-m" "clj-kondo.main"]}
4849

49-
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.4"}
50-
slipset/deps-deploy {:mvn/version "0.2.1"}}
50+
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.0"}
51+
slipset/deps-deploy {:mvn/version "0.2.2"}}
5152
:ns-default build}
5253

53-
:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.3.1043"}
54+
:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.8.1185"}
5455
org.clojure/clojure {:mvn/version "1.11.1"}
55-
org.slf4j/slf4j-simple {:mvn/version "2.0.7"} ;; to rid ourselves of logger warnings
56+
org.slf4j/slf4j-simple {:mvn/version "2.0.12"} ;; to rid ourselves of logger warnings
5657
}
57-
:main-opts ["-m" "antq.core"]}
58+
:main-opts ["-m" "antq.core"
59+
"--exclude=ch.qos.logback/[email protected]" ;; requires min jdk 11, we are currently jdk8 compatible
60+
"--exclude=ch.qos.logback/[email protected]" ;; requires min jdk 11, we are currently jdk8 compatible
61+
]}
5862

5963
:repl/cider
60-
{:extra-deps {nrepl/nrepl {:mvn/version "1.0.0"}
61-
cider/cider-nrepl {:mvn/version "0.30.0"}
62-
refactor-nrepl/refactor-nrepl {:mvn/version "3.6.0"}}
64+
{:extra-deps {nrepl/nrepl {:mvn/version "1.1.1"}
65+
cider/cider-nrepl {:mvn/version "0.47.0"}
66+
refactor-nrepl/refactor-nrepl {:mvn/version "3.10.0"}}
6367
:jvm-opts ["-XX:-OmitStackTraceInFastThrow"]
6468
:main-opts ["-m" "nrepl.cmdline"
6569
"--middleware" "[refactor-nrepl.middleware/wrap-refactor,cider.nrepl/cider-middleware]"

‎test/etaoin/api_test.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
(get-drivers-from-prop)
5151
(get-default-drivers)))
5252

53-
(def ^:dynamic *driver*)
53+
(def ^:dynamic *driver* nil)
5454

5555
(defn- find-available-port []
5656
(with-open [sock (ServerSocket. 0)]

‎test/etaoin/ide_test.clj

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
[etaoin.ide.flow :as ide]
88
[etaoin.test-report :as test-report]))
99

10-
(def ^:dynamic *driver*)
11-
(def ^:dynamic *base-url*)
12-
(def ^:dynamic *test-file-path*)
10+
(def ^:dynamic *driver* nil)
11+
(def ^:dynamic *base-url* nil)
12+
(def ^:dynamic *test-file-path* nil)
1313

1414
(defn get-default-drivers
1515
"Default and supported drivers for ide tests"

‎test/etaoin/test_report.clj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
(ns etaoin.test-report
22
(:require [clojure.test]))
33

4-
(def ^:dynamic *context*)
4+
(def ^:dynamic *context* nil)
55

66
(def platform
77
(if (System/getProperty "babashka.version") "bb" "jvm"))
88

99
(defmethod clojure.test/report :begin-test-var [m]
1010
(let [test-name (-> m :var meta :name)]
11-
(if (bound? #'*context*)
11+
(if *context*
1212
(println (format "=== %s [%s][%s]" test-name platform *context*))
1313
(println (format "=== %s [%s]" test-name platform)))))

0 commit comments

Comments
 (0)