diff --git a/CHANGELOG.md b/CHANGELOG.md index 91dc6f1..647dae5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * 2.2.next in progress * Fix [#387](https://github.com/seancorfield/honeysql/issues/387) again. + * Update CI to reflect Clojure 1.11 release (master -> 1.11; new master is 1.12). * Update `build-clj` to v0.8.0. * 2.2.868 -- 2022-02-21 diff --git a/build.clj b/build.clj index bdebd3b..65e471f 100644 --- a/build.clj +++ b/build.clj @@ -33,7 +33,8 @@ Optionally specify :aliases vector: [:1.9] -- test against Clojure 1.9 (the default) [:1.10] -- test against Clojure 1.10.3 - [:master] -- test against Clojure 1.11 master snapshot + [:1.11] -- test against Clojure 1.11.0 + [:master] -- test against Clojure 1.12 master snapshot [:cljs] -- test against ClojureScript" [{:keys [aliases] :as opts}] (gen-doc-tests opts) @@ -47,7 +48,7 @@ (defn test "Run basic tests." [opts] (-> opts - (assoc :aliases [:1.10]) + (assoc :aliases [:1.11]) (bb/run-tests))) (defn ci "Run the CI pipeline of tests (and build the JAR)." [opts] @@ -58,13 +59,13 @@ (reduce (fn [opts alias] (run-doc-tests (assoc opts :aliases [alias]))) opts - [:cljs :1.9 :1.10 :master])) + [:cljs :1.9 :1.10 :1.11 :master])) (eastwood) (as-> opts (reduce (fn [opts alias] (bb/run-tests (assoc opts :aliases [alias]))) opts - [:cljs :1.9 :1.10 :master])) + [:cljs :1.9 :1.10 :1.11 :master])) (bb/clean) (assoc :src-pom "template/pom.xml") (bb/jar))) diff --git a/deps.edn b/deps.edn index 6696de0..aa24484 100644 --- a/deps.edn +++ b/deps.edn @@ -10,7 +10,8 @@ ;; versions to test against: :1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}} :1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}} - :master {:override-deps {org.clojure/clojure {:mvn/version "1.11.1-master-SNAPSHOT"}}} + :1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.0"}}} + :master {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-master-SNAPSHOT"}}} ;; running tests/checks of various kinds: :test