Skip to content

Commit 492c701

Browse files
lreadlread
authored
maint: bump deps (ci and test only) (#75)
Of note: - turfed: bb no longer needs https://github.com/babashka/tools.namespace to run tests - bump ring-jetty-adapter to latest version that works on jdk8 - now also testing against clojure 1.12 - now also testing against jdk 21
1 parent 70c34e4 commit 492c701

File tree

9 files changed

+48
-30
lines changed

9 files changed

+48
-30
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/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919

2020
- name: Setup
2121
uses: ./.github/workflows/shared-setup

‎.github/workflows/shared-setup/action.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414

1515
steps:
1616
- name: Clojure deps cache
17-
uses: actions/cache@v3
17+
uses: actions/cache@v4
1818
with:
1919
path: |
2020
~/.m2/repository
@@ -24,13 +24,13 @@ runs:
2424
restore-keys: cljdeps-
2525

2626
- name: Setup Java
27-
uses: actions/setup-java@v3
27+
uses: actions/setup-java@v4
2828
with:
2929
distribution: 'temurin'
3030
java-version: ${{ inputs.jdk }}
3131

3232
- name: Install Clojure Tools
33-
uses: DeLaGuardo/setup-clojure@9.5
33+
uses: DeLaGuardo/setup-clojure@12.5
3434
with:
3535
cli: 'latest'
3636
bb: 'latest'
@@ -44,6 +44,7 @@ runs:
4444
bb --version
4545
echo "clojure --version"
4646
clojure --version
47+
4748
- name: Download Clojure Dependencies
4849
shell: ${{ inputs.shell }}
4950
run: bb download-deps

‎.github/workflows/tests.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3.0.2
16+
uses: actions/checkout@v4
1717

1818
- name: Setup
1919
uses: ./.github/workflows/shared-setup
@@ -29,14 +29,14 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
os: [{name: 'windows', shell: 'pwsh'}, {name: 'ubuntu', shell: 'bash'}]
32-
clojure-version: ["1.8", "1.9", "1.10", "1.11"]
33-
jdk: ['8', '11', '17']
32+
clojure-version: ["1.8", "1.9", "1.10", "1.11", "1.12"]
33+
jdk: ['8', '11', '17', '21']
3434

35-
name: ${{ matrix.os.name }} clj-${{ matrix.clojure-version }} jdk${{ matrix.java-version }}
35+
name: ${{ matrix.os.name }} clj-${{ matrix.clojure-version }} jdk${{ matrix.jdk }}
3636

3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
4040

4141
- name: Setup
4242
uses: ./.github/workflows/shared-setup
@@ -58,7 +58,7 @@ jobs:
5858

5959
steps:
6060
- name: Checkout
61-
uses: actions/checkout@v3.0.2
61+
uses: actions/checkout@v4
6262

6363
- name: Setup
6464
uses: ./.github/workflows/shared-setup

‎bb.edn

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{:paths ["script" "build"]
22
:deps {lread/status-line {:git/url "https://github.com/lread/status-line.git"
3-
:sha "35ed39645038e81b42cb15ed6753b8462e60a06d"}
3+
:sha "cf44c15f30ea3867227fa61ceb823e5e942c707f"}
44
version-clj/version-clj {:mvn/version "2.0.2"}}
55
:tasks {;; setup
66
:requires ([babashka.fs :as fs]
@@ -28,9 +28,7 @@
2828
{:doc "Runs tests under babashka Clojure (recognizes cognitect test-runner args)"
2929
:extra-paths ["src" "test" "test-resources"]
3030
:extra-deps {io.github.cognitect-labs/test-runner
31-
{:git/tag "v0.5.1" :git/sha "dfb30dd"}
32-
org.clojure/tools.namespace {:git/url "https://github.com/babashka/tools.namespace"
33-
:git/sha "16b8c53174a5c9d89d6e0ce4128aa30b071aabdf"}}
31+
{:git/tag "v0.5.1" :git/sha "dfb30dd"}}
3432
:requires ([cognitect.test-runner :as tr])
3533
:task (apply tr/-main *command-line-args*)}
3634
lint
@@ -44,8 +42,7 @@
4442
:task publish/-main}
4543
neil ;; let's not rely on a random version of neil
4644
{:doc "Pinned version of babashka/neil (used in scripting)"
47-
:extra-deps {babashka/neil {:git/url "https://github.com/babashka/neil.git"
48-
:sha "6fc58cc6a4253c2c15f05135f1610ab3d46d961f"}}
45+
:extra-deps {io.github.babashka/neil {:git/tag "v0.2.63" :git/sha "076fb83"}}
4946
:task babashka.neil/-main}
5047
;; hidden tasks, no need for folks to be trying these ci invoked tasks
5148
-ci-clojars-deploy

‎deps.edn

+13-12
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,30 @@
88
:1.8 {:override-deps {org.clojure/clojure {:mvn/version "1.8.0"}}}
99
:1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
1010
:1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
11-
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}}
11+
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}}
12+
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-alpha9"}}}
1213
:build
1314
{:extra-paths ["build"]
14-
:deps {io.github.clojure/tools.build {:git/tag "v0.8.3" :git/sha "0d20256"}
15-
slipset/deps-deploy {:mvn/version "0.2.0"}}
15+
:deps {io.github.clojure/tools.build {:mvn/version "0.10.0"}
16+
slipset/deps-deploy {:mvn/version "0.2.2"}}
1617
:ns-default build}
1718
:http-server ;; used for to support integration tests
1819
{:extra-paths ["test" "test-resources"]
19-
:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
20-
:extra-deps {babashka/fs {:mvn/version "0.1.6"}
21-
ring/ring-jetty-adapter {:mvn/version "1.9.5"}
22-
ch.qos.logback/logback-classic {:mvn/version "1.2.11"
20+
:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
21+
:extra-deps {babashka/fs {:mvn/version "0.5.20"}
22+
ring/ring-jetty-adapter {:mvn/version "1.10.0"} ;; stick with version that works on jdk8
23+
ch.qos.logback/logback-classic {:mvn/version "1.5.3"
2324
:exclusions [org.slf4j/slf4j-api]}
24-
org.slf4j/jcl-over-slf4j {:mvn/version "1.7.36"}
25-
org.slf4j/jul-to-slf4j {:mvn/version "1.7.36"}
26-
org.slf4j/log4j-over-slf4j {:mvn/version "1.7.36"}}
25+
org.slf4j/jcl-over-slf4j {:mvn/version "2.0.12"}
26+
org.slf4j/jul-to-slf4j {:mvn/version "2.0.12"}
27+
org.slf4j/log4j-over-slf4j {:mvn/version "2.0.12"}}
2728
:exec-fn clj-http.lite.test-util.http-server/run}
2829
:test
2930
{:extra-paths ["test"]
3031
:extra-deps {io.github.cognitect-labs/test-runner
3132
{:git/tag "v0.5.1" :git/sha "dfb30dd"}}
3233
:main-opts ["-m" "cognitect.test-runner"]}
3334
;; for consistent linting we use a specific version of clj-kondo through the jvm
34-
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2022.08.03"}}
35-
:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
35+
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.03.13"}}
36+
:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
3637
:main-opts ["-m" "clj-kondo.main"]}}}

‎doc/01-user-guide.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ We can discuss.
2323

2424
=== Supported Environments [[supported-envs]]
2525

26-
* JDK 8, 11, 17
26+
* JDK 8, 11, 17, 21
2727
* Clojure 1.8 runtime and above
2828
* Babashka current release
2929
* Windows, Linux, macOS

‎script/test_jvm.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[lread.status-line :as status]))
55

66
(defn -main [& args]
7-
(let [valid-clojure-versions ["1.8" "1.9" "1.10" "1.11"]
7+
(let [valid-clojure-versions ["1.8" "1.9" "1.10" "1.11" "1.12"]
88
spec {:clj-version
99
{:ref "<version>"
1010
:desc "The Clojure version to test against."

0 commit comments

Comments
 (0)