Skip to content

Commit 3d2e115

Browse files
lreadlread
authored
Merge pull request #52 from lread/lread/main-2026-05-13
maintenance
2 parents 1acf9c2 + 982e68f commit 3d2e115

5 files changed

Lines changed: 50 additions & 21 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
java-version: '25'
3838

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

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
os: [ ubuntu, windows ]
16-
java-version: [ '11', '17', '21', '25' ]
16+
java-version: [ '11', '17', '21', '25', '26' ]
1717

1818
name: ${{matrix.os}} jdk${{matrix.java-version}}
1919

@@ -45,7 +45,7 @@ jobs:
4545
java-version: ${{ matrix.java-version }}
4646

4747
- name: Install Clojure Tools
48-
uses: DeLaGuardo/setup-clojure@13.5.2
48+
uses: DeLaGuardo/setup-clojure@13.6.0
4949
with:
5050
bb: 'latest'
5151
cli: 'latest'

‎bb.edn‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
:tasks {;; setup
1010
:requires ([babashka.fs :as fs]
1111
[clojure.string :as string]
12+
[helper.jdk :as jdk]
1213
[helper.main :as main]
1314
[lread.status-line :as status])
1415
:init (do
@@ -97,9 +98,13 @@
9798
(clojure (format "-M:isolated/clj-test-runner:%s" clojure-version)))}
9899

99100
test-gen-cljs {:doc "use cljs-test-runner to run generated tests"
100-
:task (do
101-
(run '-gen-1.11)
102-
(clojure "-M:isolated/cljs-test-runner"))}
101+
:task (let [jdk-version (jdk/version)]
102+
(if (< (:major jdk-version) 21)
103+
(status/die 1 "ClojureScript requires JDK 21 or later (found JDK %s)"
104+
(:version jdk-version))
105+
(do
106+
(run '-gen-1.11)
107+
(clojure "-M:isolated/cljs-test-runner"))))}
103108

104109
test-gen-all {:doc "run generated tests under all platforms"
105110
:depends [test-gen-kaocha test-gen-clj test-gen-cljs]}
@@ -123,14 +128,18 @@
123128

124129
ci-test {:doc "run continuous integration service tests"
125130
:task (when (no-args-check)
131+
(let [jdk-version (jdk/version)]
126132
(run 'clean)
127133
(run 'lint)
128134
(run-under ["1.11" "1.12"] 'test-unit)
129135
(run-under ["1.11" "1.12"] 'test-integration)
130136
(run 'gen)
131137
(run-under ["1.9" "1.10" "1.11" "1.12"] 'test-gen-kaocha) ;; kaocha min version is 1.9
132138
(run-under ["1.8" "1.9" "1.10" "1.11" "1.12"] 'test-gen-clj) ;; also include 1.8
133-
(run 'test-gen-cljs))}
139+
(if (< (:major jdk-version) 21)
140+
(status/line :warn "ClojureScript requires JDK 21 or later (found JDK %s), skipping: test-gen-cljs"
141+
(:version jdk-version))
142+
(run 'test-gen-cljs))))}
134143

135144
ci-release {:doc "release task, use --help for args"
136145
:requires [ci-release]

‎deps.edn‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
:deps {org.clojure/clojure {:mvn/version "1.11.4"}
44
org.clojure/tools.reader {:mvn/version "1.6.0"}
5-
babashka/fs {:mvn/version "0.5.30"}
6-
clj-kondo/clj-kondo {:mvn/version "2026.01.19"}
5+
babashka/fs {:mvn/version "0.5.33"}
6+
clj-kondo/clj-kondo {:mvn/version "2026.04.15"}
77
dev.nubank/docopt {:mvn/version "0.6.1-fix7"}
8-
metosin/malli {:mvn/version "0.20.0"}
9-
rewrite-clj/rewrite-clj {:mvn/version "1.2.51"}}
8+
metosin/malli {:mvn/version "0.20.1"}
9+
rewrite-clj/rewrite-clj {:mvn/version "1.2.54"}}
1010

1111
:aliases {;; we use babashka/neil for project attributes
1212
;; publish workflow references these values (and automatically bumps patch component of version)
@@ -23,15 +23,15 @@
2323
:1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
2424
:1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
2525
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}}
26-
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.4"}}}
26+
:1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.5"}}}
2727

2828
;;
2929
;; REPL to support bb dev-jvm & dev-cljs tasks, see script/dev_repl.clj
3030
;;
3131
:nrepl
32-
{:extra-deps {nrepl/nrepl {:mvn/version "1.5.2"}
33-
cider/cider-nrepl {:mvn/version "0.58.0"}
34-
refactor-nrepl/refactor-nrepl {:mvn/version "3.11.0"}}
32+
{:extra-deps {nrepl/nrepl {:mvn/version "1.7.0"}
33+
cider/cider-nrepl {:mvn/version "0.59.0"}
34+
refactor-nrepl/refactor-nrepl {:mvn/version "3.12.0"}}
3535
:jvm-opts ["-XX:-OmitStackTraceInFastThrow" "-Djdk.attach.allowAttachSelf"]
3636
:main-opts ["-m" "nrepl.cmdline"
3737
"--middleware" "[refactor-nrepl.middleware/wrap-refactor cider.nrepl/cider-middleware]"
@@ -40,7 +40,7 @@
4040
:flowstorm
4141
{;; for disabling the official compiler
4242
:classpath-overrides {org.clojure/clojure nil}
43-
:extra-deps {com.github.flow-storm/clojure {:mvn/version "1.12.4"}
43+
:extra-deps {com.github.flow-storm/clojure {:mvn/version "1.12.5"}
4444
com.github.flow-storm/flow-storm-dbg {:mvn/version "4.5.9"}}
4545
:jvm-opts ["-Dclojure.storm.instrumentEnable=true"]}
4646

@@ -63,7 +63,7 @@
6363

6464
;; for kaocha see also tests.edn
6565
:kaocha {:extra-deps {lambdaisland/kaocha {:mvn/version "1.91.1392"}
66-
nubank/matcher-combinators {:mvn/version "3.9.2"}}
66+
nubank/matcher-combinators {:mvn/version "3.10.0"}}
6767
:extra-paths ["test"]
6868
:main-opts ["-m" "kaocha.runner"]}
6969

@@ -78,7 +78,8 @@
7878
:replace-paths ["test"] ;; include test to bring in kaocha hook
7979
:main-opts ["-m" "kaocha.runner"]}
8080

81-
:isolated/cljs-test-runner {:replace-deps {org.clojure/clojure {:mvn/version "1.8.0"}
81+
:isolated/cljs-test-runner {:replace-deps {org.clojure/clojure {:mvn/version "1.9.0"}
82+
org.clojure/clojurescript {:mvn/version "1.12.145"}
8283
olical/cljs-test-runner {:mvn/version "3.8.1"}}
8384
:replace-paths ["target/test-doc-blocks/test"]
8485
:main-opts ["-m" "cljs-test-runner.main"
@@ -104,18 +105,18 @@
104105
;;
105106
;; Deployment
106107
;;
107-
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.12"}}
108+
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.13"}}
108109
:extra-paths ["src" "build"]
109110
:ns-default build}
110111

111112
;; keep deploy deps separate from build deps to avoid download-deps issues
112113
;; caused by, I think, conflicting maven deps
113-
:deploy {:extra-deps {slipset/deps-deploy {:mvn/version "0.2.2"}}}
114+
:deploy {:extra-deps {slipset/deps-deploy {:mvn/version "0.2.3"}}}
114115

115116
;; Maintenance
116117
:outdated {:extra-deps {org.clojure/clojure {:mvn/version "1.12.3"}
117118
com.github.liquidz/antq {:mvn/version "2.11.1276"}
118-
org.slf4j/slf4j-simple {:mvn/version "2.0.17"} ;; to rid ourselves of logger warnings
119+
org.slf4j/slf4j-simple {:mvn/version "2.0.18"} ;; to rid ourselves of logger warnings
119120
}
120121
:main-opts ["-m" "antq.core" "--ignore-locals"
121122
"--exclude=lambdaisland/kaocha@1.88.1376" ;; breaks clojure 1.9 compat: https://github.com/lambdaisland/kaocha/issues/433

‎script/helper/jdk.clj‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
(ns helper.jdk
2+
(:require [helper.shell :as shell]))
3+
4+
(defn version
5+
"Returns jdk version and major version with appropriate conversion. (ex 1.8 returns major of 8)"
6+
[]
7+
(let [raw-version (->> (shell/command {:err :string}
8+
"java -version")
9+
:err
10+
(re-find #"version \"(.*)\"")
11+
last)
12+
major-minor (->> raw-version
13+
(re-find #"(\d+)(?:\.(\d+))?.*")
14+
rest
15+
(map #(when % (Integer/parseInt %))))]
16+
{:version raw-version
17+
:major (if (= (first major-minor) 1)
18+
(second major-minor)
19+
(first major-minor))}))

0 commit comments

Comments
 (0)