Skip to content

Commit

Permalink
update clojure to 1.11.3 and other dev deps
Browse files Browse the repository at this point in the history
Signed-off-by: Sean Corfield <[email protected]>
  • Loading branch information
seancorfield committed May 7, 2024
1 parent 5bf9a1a commit e996569
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 15 deletions.
5 changes: 3 additions & 2 deletions .clj-kondo/com.github.seancorfield/expectations/config.edn
Original file line number Diff line number Diff line change
@@ -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/=}}
Original file line number Diff line number Diff line change
Expand Up @@ -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}))
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -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}}}
4 changes: 2 additions & 2 deletions resources/org/corfield/new/app/build/deps.tmpl
Original file line number Diff line number Diff line change
@@ -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"}
Expand Down
4 changes: 2 additions & 2 deletions resources/org/corfield/new/lib/build/deps.tmpl
Original file line number Diff line number Diff line change
@@ -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
{:test
{:extra-paths ["test"]
:extra-deps {org.clojure/test.check {:mvn/version "1.1.1"}
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}}}
4 changes: 2 additions & 2 deletions resources/org/corfield/new/template/build/deps.tmpl
Original file line number Diff line number Diff line change
@@ -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"]
Expand All @@ -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}}}
4 changes: 2 additions & 2 deletions resources/org/corfield/new/template/resources/build/deps.tmpl
Original file line number Diff line number Diff line change
@@ -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
{:test
{:extra-paths ["test"]
:extra-deps {org.clojure/test.check {:mvn/version "1.1.1"}
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}}}

0 comments on commit e996569

Please sign in to comment.