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

maint: bump deps (ci and test only) #75

Merged
merged 3 commits into from
Mar 13, 2024
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: 3 additions & 0 deletions .clj-kondo/http-kit/http-kit/config.edn
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

{:hooks
{:analyze-call {org.httpkit.server/with-channel httpkit.with-channel/with-channel}}}
16 changes: 16 additions & 0 deletions .clj-kondo/http-kit/http-kit/httpkit/with_channel.clj
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
(ns httpkit.with-channel
(:require [clj-kondo.hooks-api :as api]))

(defn with-channel [{node :node}]
(let [[request channel & body] (rest (:children node))]
(when-not (and request channel) (throw (ex-info "No request or channel provided" {})))
(when-not (api/token-node? channel) (throw (ex-info "Missing channel argument" {})))
(let [new-node
(api/list-node
(list*
(api/token-node 'let)
(api/vector-node [channel (api/vector-node [])])
request
body))]

{:node new-node})))
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/workflows/shared-setup
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/shared-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:

steps:
- name: Clojure deps cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.m2/repository
Expand All @@ -24,13 +24,13 @@ runs:
restore-keys: cljdeps-

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ inputs.jdk }}

- name: Install Clojure Tools
uses: DeLaGuardo/setup-clojure@9.5
uses: DeLaGuardo/setup-clojure@12.5
with:
cli: 'latest'
bb: 'latest'
Expand All @@ -44,6 +44,7 @@ runs:
bb --version
echo "clojure --version"
clojure --version

- name: Download Clojure Dependencies
shell: ${{ inputs.shell }}
run: bb download-deps
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3.0.2
uses: actions/checkout@v4

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

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

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup
uses: ./.github/workflows/shared-setup
Expand All @@ -58,7 +58,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3.0.2
uses: actions/checkout@v4

- name: Setup
uses: ./.github/workflows/shared-setup
Expand Down
9 changes: 3 additions & 6 deletions bb.edn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{:paths ["script" "build"]
:deps {lread/status-line {:git/url "https://github.com/lread/status-line.git"
:sha "35ed39645038e81b42cb15ed6753b8462e60a06d"}
:sha "cf44c15f30ea3867227fa61ceb823e5e942c707f"}
version-clj/version-clj {:mvn/version "2.0.2"}}
:tasks {;; setup
:requires ([babashka.fs :as fs]
Expand Down Expand Up @@ -28,9 +28,7 @@
{:doc "Runs tests under babashka Clojure (recognizes cognitect test-runner args)"
:extra-paths ["src" "test" "test-resources"]
:extra-deps {io.github.cognitect-labs/test-runner
{:git/tag "v0.5.1" :git/sha "dfb30dd"}
org.clojure/tools.namespace {:git/url "https://github.com/babashka/tools.namespace"
:git/sha "16b8c53174a5c9d89d6e0ce4128aa30b071aabdf"}}
{:git/tag "v0.5.1" :git/sha "dfb30dd"}}
:requires ([cognitect.test-runner :as tr])
:task (apply tr/-main *command-line-args*)}
lint
Expand All @@ -44,8 +42,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 {babashka/neil {:git/url "https://github.com/babashka/neil.git"
:sha "6fc58cc6a4253c2c15f05135f1610ab3d46d961f"}}
:extra-deps {io.github.babashka/neil {:git/tag "v0.2.63" :git/sha "076fb83"}}
:task babashka.neil/-main}
;; hidden tasks, no need for folks to be trying these ci invoked tasks
-ci-clojars-deploy
Expand Down
25 changes: 13 additions & 12 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,30 @@
:1.8 {:override-deps {org.clojure/clojure {:mvn/version "1.8.0"}}}
: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.1"}}}
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}}
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-alpha9"}}}
:build
{:extra-paths ["build"]
:deps {io.github.clojure/tools.build {:git/tag "v0.8.3" :git/sha "0d20256"}
slipset/deps-deploy {:mvn/version "0.2.0"}}
:deps {io.github.clojure/tools.build {:mvn/version "0.10.0"}
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.1"}}
:extra-deps {babashka/fs {:mvn/version "0.1.6"}
ring/ring-jetty-adapter {:mvn/version "1.9.5"}
ch.qos.logback/logback-classic {:mvn/version "1.2.11"
:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
:extra-deps {babashka/fs {:mvn/version "0.5.20"}
ring/ring-jetty-adapter {:mvn/version "1.10.0"} ;; stick with version that works on jdk8
ch.qos.logback/logback-classic {:mvn/version "1.5.3"
:exclusions [org.slf4j/slf4j-api]}
org.slf4j/jcl-over-slf4j {:mvn/version "1.7.36"}
org.slf4j/jul-to-slf4j {:mvn/version "1.7.36"}
org.slf4j/log4j-over-slf4j {:mvn/version "1.7.36"}}
org.slf4j/jcl-over-slf4j {:mvn/version "2.0.12"}
org.slf4j/jul-to-slf4j {:mvn/version "2.0.12"}
org.slf4j/log4j-over-slf4j {:mvn/version "2.0.12"}}
: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 "2022.08.03"}}
:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.03.13"}}
:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
:main-opts ["-m" "clj-kondo.main"]}}}
2 changes: 1 addition & 1 deletion doc/01-user-guide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ We can discuss.

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

* JDK 8, 11, 17
* JDK 8, 11, 17, 21
* Clojure 1.8 runtime and above
* Babashka current release
* Windows, Linux, macOS
Expand Down
2 changes: 1 addition & 1 deletion script/test_jvm.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[lread.status-line :as status]))

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