Skip to content

Commit d8e4291

Browse files
vemvvemv
authored
Use cider-nrepl 0.40.0 (#3520)
https://github.com/clojure-emacs/cider-nrepl/blob/v0.40.0/CHANGELOG.md#0400-2023-10-15 https://clojars.org/cider/cider-nrepl/versions/0.40.0
1 parent 74e840f commit d8e4291

File tree

8 files changed

+40
-33
lines changed

8 files changed

+40
-33
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
## master (unreleased)
44

5+
## 1.8.1 (2023-10-15)
6+
7+
### Changes
8+
9+
- Bump the injected `cider-nrepl` to [0.40.0](https://github.com/clojure-emacs/cider-nrepl/blob/v0.40.0/CHANGELOG.md#0400-2023-10-15).
10+
- Improves the `:style/indent` `:arglist` and other key metadata propagation for ClojureScript macros.
11+
512
## 1.8.0 (2023-10-13)
613

714
### New features

‎cider.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ the artifact.")
527527
(defconst cider-latest-clojure-version "1.10.1"
528528
"Latest supported version of Clojure.")
529529

530-
(defconst cider-required-middleware-version "0.39.1"
530+
(defconst cider-required-middleware-version "0.40.0"
531531
"The CIDER nREPL version that's known to work properly with CIDER.")
532532

533533
(defcustom cider-injected-middleware-version cider-required-middleware-version

‎dev/docker-sample-project/project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
:dependencies [[org.clojure/clojure "1.11.1"]
33
[clj-http "3.12.3"]]
44
:source-paths ["src"]
5-
:plugins [[cider/cider-nrepl "0.39.1"]])
5+
:plugins [[cider/cider-nrepl "0.40.0"]])

‎dev/tramp-sample-project/project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
:dependencies [[org.clojure/clojure "1.11.1"]
33
[clj-http "3.12.3"]]
44
:source-paths ["src"]
5-
:plugins [[cider/cider-nrepl "0.39.1"]
5+
:plugins [[cider/cider-nrepl "0.40.0"]
66
[refactor-nrepl "3.9.0"]])

‎doc/modules/ROOT/pages/basics/middleware_setup.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ Use the convenient plugin for defaults, either in your project's
3232

3333
[source,clojure]
3434
----
35-
:plugins [[cider/cider-nrepl "0.39.1"]]
35+
:plugins [[cider/cider-nrepl "0.40.0"]]
3636
----
3737

3838
A minimal `profiles.clj` for CIDER would be:
3939

4040
[source,clojure]
4141
----
42-
{:repl {:plugins [[cider/cider-nrepl "0.39.1"]]}}
42+
{:repl {:plugins [[cider/cider-nrepl "0.40.0"]]}}
4343
----
4444

4545
WARNING: Be careful not to place this in the `:user` profile, as this way CIDER's
@@ -59,7 +59,7 @@ all of their projects using a `~/.boot/profile.boot` file like so:
5959
(require 'boot.repl)
6060
6161
(swap! boot.repl/*default-dependencies*
62-
concat '[[cider/cider-nrepl "0.39.1"]])
62+
concat '[[cider/cider-nrepl "0.40.0"]])
6363
6464
(swap! boot.repl/*default-middleware*
6565
conj 'cider.nrepl/cider-middleware)
@@ -76,11 +76,11 @@ run `cider-connect` or `cider-connect-cljs`.
7676

7777
[source,clojure]
7878
----
79-
:cider-clj {:extra-deps {cider/cider-nrepl {:mvn/version "0.39.1"}}
79+
:cider-clj {:extra-deps {cider/cider-nrepl {:mvn/version "0.40.0"}}
8080
:main-opts ["-m" "nrepl.cmdline" "--middleware" "[cider.nrepl/cider-middleware]"]}
8181
8282
:cider-cljs {:extra-deps {org.clojure/clojurescript {:mvn/version "1.10.339"}
83-
cider/cider-nrepl {:mvn/version "0.39.1"}
83+
cider/cider-nrepl {:mvn/version "0.40.0"}
8484
cider/piggieback {:mvn/version "0.5.3"}}
8585
:main-opts ["-m" "nrepl.cmdline" "--middleware"
8686
"[cider.nrepl/cider-middleware,cider.piggieback/wrap-cljs-repl]"]}

‎doc/modules/ROOT/pages/basics/up_and_running.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ simple - CIDER simply passes the extra dependencies and nREPL configuration to
6767
your build tool in the command it runs to start the nREPL server. Here's how
6868
this looks for `tools.deps`:
6969

70-
$ clojure -Sdeps '{:deps {nrepl {:mvn/version "0.6.0"} cider/cider-nrepl {:mvn/version "0.39.1"}}}' -m nrepl.cmdline --middleware '["cider.nrepl/cider-middleware"]'
70+
$ clojure -Sdeps '{:deps {nrepl {:mvn/version "0.6.0"} cider/cider-nrepl {:mvn/version "0.40.0"}}}' -m nrepl.cmdline --middleware '["cider.nrepl/cider-middleware"]'
7171

7272
TIP: If you don't want `cider-jack-in` to inject dependencies automatically, set
7373
`cider-inject-dependencies-at-jack-in` to `nil`. Note that you'll have to setup
@@ -292,7 +292,7 @@ It is also possible for plain `clj`, although the command is somewhat longer:
292292

293293
[source,sh]
294294
----
295-
$ clj -Sdeps '{:deps {cider/cider-nrepl {:mvn/version "0.39.1"}}}' -m nrepl.cmdline --middleware "[cider.nrepl/cider-middleware]"
295+
$ clj -Sdeps '{:deps {cider/cider-nrepl {:mvn/version "0.40.0"}}}' -m nrepl.cmdline --middleware "[cider.nrepl/cider-middleware]"
296296
----
297297

298298
Alternatively, you can start nREPL either manually or using the facilities

‎doc/modules/ROOT/pages/cljs/shadow-cljs.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ And connect to it with `cider-connect`.
6262
...For that to work, `shadow-cljs.edn` contents like the following are assumed:
6363

6464
```clj
65-
:dependencies [[cider/cider-nrepl "0.39.1"] ;; mandatory (unless it's inherited from deps.edn or otherwise present in the classpath of shadow-cljs's JVM process)
65+
:dependencies [[cider/cider-nrepl "0.40.0"] ;; mandatory (unless it's inherited from deps.edn or otherwise present in the classpath of shadow-cljs's JVM process)
6666
[refactor-nrepl/refactor-nrepl "3.9.0"]] ;; refactor-nrepl is optional
6767

6868
:nrepl {:middleware [cider.nrepl/cider-middleware ;; it's advisable to explicitly add this middleware. It's automatically added by shadow-cljs (if available in the classpath), unless `:nrepl {:cider false}`

‎test/cider-tests.el

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
(describe "when there is a single dependency"
145145
(before-each
146146
(setq-local cider-injected-nrepl-version "0.9.0")
147-
(setq-local cider-injected-middleware-version "0.39.1")
147+
(setq-local cider-injected-middleware-version "0.40.0")
148148
(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
149149
(setq-local cider-jack-in-dependencies-exclusions '())
150150
(setq-local cider-enrich-classpath t))
@@ -154,7 +154,7 @@
154154
:to-equal (concat "update-in :dependencies conj "
155155
(shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
156156
" -- update-in :plugins conj "
157-
(shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]")
157+
(shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]")
158158
" -- update-in :plugins conj "
159159
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
160160
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
@@ -167,7 +167,7 @@
167167
"update-in :dependencies conj "
168168
(shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure]]")
169169
" -- update-in :plugins conj "
170-
(shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]")
170+
(shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]")
171171
" -- update-in :plugins conj "
172172
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
173173
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
@@ -179,7 +179,7 @@
179179
:to-equal (concat "update-in :dependencies conj "
180180
(shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure foo.bar/baz]]")
181181
" -- update-in :plugins conj "
182-
(shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]")
182+
(shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]")
183183
" -- update-in :plugins conj "
184184
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
185185
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
@@ -192,7 +192,7 @@
192192
" -d "
193193
(shell-quote-argument "nrepl/nrepl:0.9.0")
194194
" -d "
195-
(shell-quote-argument "cider/cider-nrepl:0.39.1")
195+
(shell-quote-argument "cider/cider-nrepl:0.40.0")
196196
" cider.tasks/add-middleware"
197197
" -m "
198198
(shell-quote-argument "cider.nrepl/cider-middleware")
@@ -201,7 +201,7 @@
201201
(it "can inject dependencies in a gradle project"
202202
(expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 'gradle)
203203
:to-equal (concat "--no-daemon "
204-
(shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.39.1")
204+
(shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.40.0")
205205
" :clojureRepl "
206206
(shell-quote-argument "--middleware=cider.nrepl/cider-middleware")))))
207207

@@ -218,7 +218,7 @@
218218
" -- update-in :plugins conj "
219219
(shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
220220
" -- update-in :plugins conj "
221-
(shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]")
221+
(shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]")
222222
" -- update-in :plugins conj "
223223
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
224224
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
@@ -231,7 +231,7 @@
231231
" -d "
232232
(shell-quote-argument "nrepl/nrepl:0.9.0")
233233
" -d "
234-
(shell-quote-argument "cider/cider-nrepl:0.39.1")
234+
(shell-quote-argument "cider/cider-nrepl:0.40.0")
235235
" -d "
236236
(shell-quote-argument "refactor-nrepl:2.0.0")
237237
" cider.tasks/add-middleware"
@@ -253,7 +253,7 @@
253253
:to-equal (concat "-o -U update-in :dependencies conj "
254254
(shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
255255
" -- update-in :plugins conj "
256-
(shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]")
256+
(shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]")
257257
" -- update-in :plugins conj "
258258
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
259259
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
@@ -264,15 +264,15 @@
264264
" -d "
265265
(shell-quote-argument "nrepl/nrepl:0.9.0")
266266
" -d "
267-
(shell-quote-argument "cider/cider-nrepl:0.39.1")
267+
(shell-quote-argument "cider/cider-nrepl:0.40.0")
268268
" cider.tasks/add-middleware"
269269
" -m "
270270
(shell-quote-argument "cider.nrepl/cider-middleware")
271271
" repl -s wait")))
272272
(it "can concat in a gradle project"
273273
(expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 'gradle)
274274
:to-equal (concat "--no-daemon "
275-
(shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.39.1")
275+
(shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.40.0")
276276
" :clojureRepl "
277277
(shell-quote-argument "--middleware=cider.nrepl/cider-middleware")))))
278278

@@ -287,14 +287,14 @@
287287
(setq-local cider-jack-in-nrepl-middlewares '(("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate) "cider.nrepl/cider-middleware" ("another/middleware"))))
288288
(it "includes plugins whose predicates return true"
289289
(expect (cider-jack-in-normalized-lein-plugins)
290-
:to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.39.1"))))
290+
:to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.40.0"))))
291291
(it "includes middlewares whose predicates return true"
292292
(expect (cider-jack-in-normalized-nrepl-middlewares)
293293
:to-equal '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware" "another/middleware")))
294294
(it "ignores plugins whose predicates return false"
295295
(spy-on 'plugins-predicate :and-return-value nil)
296296
(expect (cider-jack-in-normalized-lein-plugins)
297-
:to-equal '(("cider/cider-nrepl" "0.39.1")))
297+
:to-equal '(("cider/cider-nrepl" "0.40.0")))
298298
(spy-on 'middlewares-predicate :and-return-value nil)
299299
(expect (cider-jack-in-normalized-nrepl-middlewares)
300300
:to-equal '("cider.nrepl/cider-middleware" "another/middleware")))
@@ -323,7 +323,7 @@
323323
:and-return-value '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware"))
324324
(spy-on 'cider-jack-in-normalized-lein-plugins
325325
:and-return-value '(("refactor-nrepl" "2.0.0")
326-
("cider/cider-nrepl" "0.39.1")
326+
("cider/cider-nrepl" "0.40.0")
327327
("mx.cider/lein-enrich-classpath" "1.18.2")))
328328
(setq-local cider-jack-in-dependencies-exclusions '())
329329
(setq-local cider-enrich-classpath t))
@@ -334,7 +334,7 @@
334334
" -- update-in :plugins conj "
335335
(shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
336336
" -- update-in :plugins conj "
337-
(shell-quote-argument "[cider/cider-nrepl \"0.39.1\"]")
337+
(shell-quote-argument "[cider/cider-nrepl \"0.40.0\"]")
338338
" -- update-in :plugins conj "
339339
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.2\"]")
340340
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
@@ -352,7 +352,7 @@
352352
" -d "
353353
(shell-quote-argument "nrepl/nrepl:0.9.0")
354354
" -d "
355-
(shell-quote-argument "cider/cider-nrepl:0.39.1")
355+
(shell-quote-argument "cider/cider-nrepl:0.40.0")
356356
" -d "
357357
(shell-quote-argument "refactor-nrepl:2.0.0")
358358
" cider.tasks/add-middleware"
@@ -447,7 +447,7 @@
447447
(setq-local cider-jack-in-dependencies nil)
448448
(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
449449
(let ((expected (string-join `("clojure -Sdeps "
450-
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.39.1\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
450+
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.40.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
451451
" -M:cider/nrepl")
452452
"")))
453453
(setq-local cider-allow-jack-in-without-project t)
@@ -461,7 +461,7 @@
461461

462462
(it "allows specifying custom aliases with `cider-clojure-cli-aliases`"
463463
(let ((expected (string-join `("clojure -Sdeps "
464-
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.39.1\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
464+
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.40.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
465465
" -M:dev:test:cider/nrepl")
466466
"")))
467467
(setq-local cider-jack-in-dependencies nil)
@@ -478,7 +478,7 @@
478478
(it (format "should remove duplicates, yielding the same result (for %S command invocation)" command)
479479
;; repeat the same test for PowerShell too
480480
(let ((expected (string-join `("-Sdeps "
481-
,(cider--shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.39.1\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}"
481+
,(cider--shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.40.0\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}"
482482
command)
483483
" -M:dev:test:cider/nrepl")
484484
"")))
@@ -488,7 +488,7 @@
488488
:to-equal expected))))
489489
(it "handles aliases correctly"
490490
(let ((expected (string-join `("-Sdeps "
491-
,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.39.1\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
491+
,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.40.0\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
492492
" -M:test:cider/nrepl")
493493
""))
494494
(deps '(("nrepl/nrepl" "0.9.0"))))
@@ -516,7 +516,7 @@
516516
:to-equal expected)))))
517517
(it "allows for global options"
518518
(let ((expected (string-join `("-J-Djdk.attach.allowAttachSelf -Sdeps "
519-
,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.39.1\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
519+
,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.40.0\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
520520
" -M:test:cider/nrepl")
521521
""))
522522
(deps '(("nrepl/nrepl" "0.9.0"))))
@@ -527,7 +527,7 @@
527527
(setq-local cider-jack-in-dependencies '(("org.clojure/tools.deps" (("git/sha" . "6ae2b6f71773de7549d7f22759e8b09fec27f0d9")
528528
("git/url" . "https://github.com/clojure/tools.deps/")))))
529529
(let ((expected (string-join `("clojure -Sdeps "
530-
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.39.1\"} org.clojure/tools.deps { :git/sha \"6ae2b6f71773de7549d7f22759e8b09fec27f0d9\" :git/url \"https://github.com/clojure/tools.deps/\" }} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
530+
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.40.0\"} org.clojure/tools.deps { :git/sha \"6ae2b6f71773de7549d7f22759e8b09fec27f0d9\" :git/url \"https://github.com/clojure/tools.deps/\" }} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
531531
" -M:cider/nrepl")
532532
"")))
533533
(setq-local cider-allow-jack-in-without-project t)

0 commit comments

Comments
 (0)