From 69b23c49b9fb9608f674d3fabfd65b1bcb3194ac Mon Sep 17 00:00:00 2001 From: Joel Kaasinen Date: Fri, 9 Jan 2026 09:55:05 +0200 Subject: [PATCH] chore: upgrade clojure; add clj11, clj12 and java 25 to ci matrix --- .github/workflows/testsuite.yml | 7 ++++--- project.clj | 8 +++++--- scripts/test.sh | 7 +++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml index b532072f..372f5027 100644 --- a/.github/workflows/testsuite.yml +++ b/.github/workflows/testsuite.yml @@ -9,9 +9,10 @@ jobs: strategy: matrix: # Supported Java versions: LTS releases and latest - jdk: [11, 17, 21] + jdk: [11, 17, 21, 25] + clojure: [11, 12] - name: Clojure (Java ${{ matrix.jdk }}) + name: Clojure ${{ matrix.clojure }} (Java ${{ matrix.jdk }}) runs-on: ubuntu-latest @@ -47,7 +48,7 @@ jobs: run: ./lint.sh - name: Run tests - run: ./scripts/test.sh clj + run: ./scripts/test.sh clj${{ matrix.clojure }} build-cljs: name: ClojureScript diff --git a/project.clj b/project.clj index a928b325..c485134f 100644 --- a/project.clj +++ b/project.clj @@ -67,7 +67,8 @@ [lein-codox "0.10.8"] [metosin/bat-test "0.4.4"]] - :profiles {:dev {:jvm-opts ^:replace ["-server"] + :profiles {:clj11 {:dependencies [[org.clojure/clojure "1.11.4"]]} + :dev {:jvm-opts ^:replace ["-server"] ;; all module sources for development :source-paths ["modules/reitit/src" @@ -89,9 +90,9 @@ :java-source-paths ["modules/reitit-core/java-src"] - :dependencies [[org.clojure/clojure "1.11.4"] + :dependencies [[org.clojure/clojure "1.12.4"] [thheller/shadow-cljs "3.3.4"] - [org.clojure/clojurescript "1.12.42"] + [org.clojure/clojurescript "1.12.134"] ;; modules dependencies [metosin/schema-tools "0.13.1"] @@ -159,6 +160,7 @@ :aliases {"all" ["with-profile" "dev,default"] "perf" ["with-profile" "default,dev,perf"] "test-clj" ["all" "do" ["bat-test"] ["check"]] + "test-clj11" ["with-profile" "dev,default,clj11" "do" ["bat-test"] ["check"]] ;; NOTE: These are deprecated, kept around for ensuring shadow-cljs works ;; the same way. "test-browser" ["doo" "chrome-headless" "test"] diff --git a/scripts/test.sh b/scripts/test.sh index 97125daf..9bdacf6a 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -13,11 +13,14 @@ case $1 in npx shadow-cljs release karma npx karma start --single-run ;; - clj) + clj11) + lein test-clj11 + ;; + clj12) lein test-clj ;; *) - echo "Please select [clj|cljs]" + echo "Please select [clj11|clj12|cljs]" exit 1 ;; esac