From e99656977aa8069f7023c5c8b35ecd33ce168850 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Mon, 6 May 2024 22:58:44 -0700 Subject: [PATCH] update clojure to 1.11.3 and other dev deps Signed-off-by: Sean Corfield --- .../expectations/config.edn | 5 +++-- .../github/seancorfield/expectations.clj_kondo | 17 +++++++++++++++++ CHANGELOG.md | 2 +- README.md | 2 +- deps.edn | 6 +++--- resources/org/corfield/new/app/build/deps.tmpl | 4 ++-- resources/org/corfield/new/lib/build/deps.tmpl | 4 ++-- .../org/corfield/new/template/build/deps.tmpl | 4 ++-- .../new/template/resources/build/deps.tmpl | 4 ++-- 9 files changed, 33 insertions(+), 15 deletions(-) diff --git a/.clj-kondo/com.github.seancorfield/expectations/config.edn b/.clj-kondo/com.github.seancorfield/expectations/config.edn index 0365b78..d94f1be 100644 --- a/.clj-kondo/com.github.seancorfield/expectations/config.edn +++ b/.clj-kondo/com.github.seancorfield/expectations/config.edn @@ -1,9 +1,10 @@ {:hooks {:analyze-call {expectations.clojure.test/more-> - hooks.com.github.seancorfield.expectations/more->}} + hooks.com.github.seancorfield.expectations/more-> + expectations.clojure.test/more-of + hooks.com.github.seancorfield.expectations/more-of}} :lint-as {expectations.clojure.test/defexpect clojure.test/deftest expectations.clojure.test/from-each clojure.core/for - expectations.clojure.test/more-of clj-kondo.lint-as/def-catch-all expectations.clojure.test/=? clojure.core/=}} diff --git a/.clj-kondo/com.github.seancorfield/expectations/hooks/com/github/seancorfield/expectations.clj_kondo b/.clj-kondo/com.github.seancorfield/expectations/hooks/com/github/seancorfield/expectations.clj_kondo index 8b1cd96..10a5fe5 100644 --- a/.clj-kondo/com.github.seancorfield/expectations/hooks/com/github/seancorfield/expectations.clj_kondo +++ b/.clj-kondo/com.github.seancorfield/expectations/hooks/com/github/seancorfield/expectations.clj_kondo @@ -10,3 +10,20 @@ (api/token-node 'nil) tail))] {:node rewritten})) + +(defn more-of [{:keys [node]}] + (let [bindings (fnext (:children node)) + pairs (partition 2 (nnext (:children node))) + rewritten + (api/list-node + (list* + (api/token-node 'fn) + (api/vector-node (vector bindings)) + (map (fn [[e a]] + (api/list-node + (list + (api/token-node 'expectations.clojure.test/expect) + e + a))) + pairs)))] + {:node rewritten})) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93ea933..9c0bb8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changes * v0.7.next in progress - * Update default Clojure version in generated projects to 1.11.2; update various other dependencies too. + * Update default Clojure version in generated projects to 1.11.3; update various other dependencies too. * v0.7.0 58f2c19 -- 2024-01-13 * Address [#55](https://github.com/seancorfield/deps-new/issues/55) by adding support for compound template names that can be resolved to git repositories and template paths within them. diff --git a/README.md b/README.md index afff919..a82b96e 100644 --- a/README.md +++ b/README.md @@ -249,7 +249,7 @@ both the implied `git` repo and also the template name, as if you had specified: The examples above using `-A:1.12` assume an alias like this in your `deps.edn` file: ```clojure - :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-alpha9"}}} + :1.12 {:override-deps {org.clojure/clojure {:mvn/version "1.12.0-alpha11"}}} ``` > Note: if you are on Windows, read [**Quoting keys and values**](https://clojure.org/reference/deps_and_cli#quoting) in the official **Deps and CLI Reference** documentation to understand how the above command needs to look on Powershell. Or take a look at the [Babashka CLI](#babashka-cli) library support. diff --git a/deps.edn b/deps.edn index 49eddb7..ba345f2 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:paths ["src" "resources"] :deps ; 1.12 required for add-lib - {org.clojure/clojure {:mvn/version "1.12.0-alpha9"} - io.github.clojure/tools.build {:mvn/version "0.10.0"}} + {org.clojure/clojure {:mvn/version "1.12.0-alpha11"} + io.github.clojure/tools.build {:mvn/version "0.10.3"}} :tools/usage {:ns-default org.corfield.new} @@ -14,6 +14,6 @@ {:git/tag "v0.5.1" :git/sha "dfb30dd"}} :exec-fn cognitect.test-runner.api/test} :new ; for local testing as a tool - {:deps {org.clojure/clojure {:mvn/version "1.12.0-alpha9"} + {:deps {org.clojure/clojure {:mvn/version "1.12.0-alpha11"} io.github.seancorfield/deps-new {:local/root "."}} :ns-default org.corfield.new}}} diff --git a/resources/org/corfield/new/app/build/deps.tmpl b/resources/org/corfield/new/app/build/deps.tmpl index 2bd381e..54da6e5 100644 --- a/resources/org/corfield/new/app/build/deps.tmpl +++ b/resources/org/corfield/new/app/build/deps.tmpl @@ -1,12 +1,12 @@ {:paths ["src" "resources"] - :deps {org.clojure/clojure {:mvn/version "1.11.2"}} + :deps {org.clojure/clojure {:mvn/version "1.11.3"}} :aliases {:run-m {:main-opts ["-m" "{{top/ns}}.{{main/ns}}"]} :run-x {:ns-default {{top/ns}}.{{main/ns}} :exec-fn greet :exec-args {:name "Clojure"}} :build {:deps {io.github.clojure/tools.build - {:mvn/version "0.10.0"}} + {:mvn/version "0.10.3"}} :ns-default build} :test {:extra-paths ["test"] :extra-deps {org.clojure/test.check {:mvn/version "1.1.1"} diff --git a/resources/org/corfield/new/lib/build/deps.tmpl b/resources/org/corfield/new/lib/build/deps.tmpl index 0367769..b36f125 100644 --- a/resources/org/corfield/new/lib/build/deps.tmpl +++ b/resources/org/corfield/new/lib/build/deps.tmpl @@ -1,5 +1,5 @@ {:paths ["src" "resources"] - :deps {org.clojure/clojure {:mvn/version "1.11.2"}} + :deps {org.clojure/clojure {:mvn/version "1.11.3"}} :aliases {:test {:extra-paths ["test"] @@ -7,6 +7,6 @@ io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"}}} :build {:deps {io.github.clojure/tools.build - {:mvn/version "0.10.0"} + {:mvn/version "0.10.3"} slipset/deps-deploy {:mvn/version "0.2.2"}} :ns-default build}}} diff --git a/resources/org/corfield/new/template/build/deps.tmpl b/resources/org/corfield/new/template/build/deps.tmpl index 4a8dc97..6ec4d73 100644 --- a/resources/org/corfield/new/template/build/deps.tmpl +++ b/resources/org/corfield/new/template/build/deps.tmpl @@ -1,5 +1,5 @@ {:paths ["src" "resources"] - :deps {org.clojure/clojure {:mvn/version "1.11.2"}} + :deps {org.clojure/clojure {:mvn/version "1.11.3"}} :aliases {:test {:extra-paths ["test"] @@ -9,5 +9,5 @@ io.github.seancorfield/deps-new {:git/tag "v0.7.0" :git/sha "58f2c19"}}} :build {:deps {io.github.clojure/tools.build - {:mvn/version "0.10.0"}} + {:mvn/version "0.10.3"}} :ns-default build}}} diff --git a/resources/org/corfield/new/template/resources/build/deps.tmpl b/resources/org/corfield/new/template/resources/build/deps.tmpl index 0367769..b36f125 100644 --- a/resources/org/corfield/new/template/resources/build/deps.tmpl +++ b/resources/org/corfield/new/template/resources/build/deps.tmpl @@ -1,5 +1,5 @@ {:paths ["src" "resources"] - :deps {org.clojure/clojure {:mvn/version "1.11.2"}} + :deps {org.clojure/clojure {:mvn/version "1.11.3"}} :aliases {:test {:extra-paths ["test"] @@ -7,6 +7,6 @@ io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"}}} :build {:deps {io.github.clojure/tools.build - {:mvn/version "0.10.0"} + {:mvn/version "0.10.3"} slipset/deps-deploy {:mvn/version "0.2.2"}} :ns-default build}}}