branch: elpa/cider
commit 3e54af31ffec5468a250daa2624b4344eea4e564
Author: vemv <v...@users.noreply.github.com>
Commit: vemv <v...@users.noreply.github.com>
Use cider-nrepl 0.35.1
---
CHANGELOG.md | 5 ++-
cider.el | 2 +-
.../ROOT/pages/basics/middleware_setup.adoc | 10 ++---
doc/modules/ROOT/pages/basics/up_and_running.adoc | 4 +-
doc/modules/ROOT/pages/cljs/shadow-cljs.adoc | 2 +-
test/cider-tests.el | 44 +++++++++++-----------
6 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7196c4c277..c2f01421cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,7 +40,7 @@
- [#3375](https://github.com/clojure-emacs/cider/pull/3375): `cider-test`:
don't render a newline between expected and actual, most times.
- Improve `nrepl-dict` error reporting.
- Bump the injected `piggieback` to
[0.5.3](https://github.com/nrepl/piggieback/blob/0.5.3/CHANGES.md#053-2021-10-26).
-- Bump the injected `cider-nrepl` to
[0.35](https://github.com/clojure-emacs/cider-nrepl/blob/v0.35.0/CHANGELOG.md#0350-2023-08-09).
+- Bump the injected `cider-nrepl` to
[0.35.1](https://github.com/clojure-emacs/cider-nrepl/blob/v0.35.1/CHANGELOG.md#0351-2023-08-18).
- Improves indentation, font-locking and other metadata support for
ClojureScript.
- Updates
[Orchard](https://github.com/clojure-emacs/orchard/blob/v0.14.2/CHANGELOG.md)
- introduces support for displaying the docstring and arglists of
'indirect' vars (e.g. `(def foo bar)`) for Clojure/Script.
@@ -48,7 +48,8 @@
- Updates
[Suitable](https://github.com/clojure-emacs/clj-suitable/blob/v0.5.0/CHANGELOG.md#050-2023-07-28)
- avoiding side-effecting `->` evaluation for pure-ClojureScript chains.
- Updates
[Compliment](https://github.com/alexander-yakushev/compliment/blob/0.4.0/CHANGELOG.md#040-2023-07-05)
- - Supports better completions for var-quote (`#'some/var`) .
+ - Supports better completions for var-quote (`#'some/var`).
+ - Updates
[Haystack](https://github.com/clojure-emacs/haystack/blob/v0.1.0/CHANGELOG.md#010).
## 1.7.0 (2023-03-23)
diff --git a/cider.el b/cider.el
index bf26024425..068e539016 100644
--- a/cider.el
+++ b/cider.el
@@ -489,7 +489,7 @@ the artifact.")
(defconst cider-latest-clojure-version "1.10.1"
"Latest supported version of Clojure.")
-(defconst cider-required-middleware-version "0.35.0"
+(defconst cider-required-middleware-version "0.35.1"
"The CIDER nREPL version that's known to work properly with CIDER.")
(defcustom cider-injected-middleware-version cider-required-middleware-version
diff --git a/doc/modules/ROOT/pages/basics/middleware_setup.adoc
b/doc/modules/ROOT/pages/basics/middleware_setup.adoc
index 8ddd83b558..2ebd3fcbe3 100644
--- a/doc/modules/ROOT/pages/basics/middleware_setup.adoc
+++ b/doc/modules/ROOT/pages/basics/middleware_setup.adoc
@@ -32,7 +32,7 @@ Use the convenient plugin for defaults, either in your
project's
[source,clojure]
----
-:plugins [[cider/cider-nrepl "0.35.0"]
+:plugins [[cider/cider-nrepl "0.35.1"]
[mx.cider/enrich-classpath "x.y.z"]]
----
@@ -46,7 +46,7 @@ A minimal `profiles.clj` for CIDER would be:
[source,clojure]
----
-{:repl {:plugins [[cider/cider-nrepl "0.35.0"]
+{:repl {:plugins [[cider/cider-nrepl "0.35.1"]
[mx.cider/enrich-classpath "1.9.0"]]}}
----
@@ -67,7 +67,7 @@ all of their projects using a `~/.boot/profile.boot` file
like so:
(require 'boot.repl)
(swap! boot.repl/*default-dependencies*
- concat '[[cider/cider-nrepl "0.35.0"]])
+ concat '[[cider/cider-nrepl "0.35.1"]])
(swap! boot.repl/*default-middleware*
conj 'cider.nrepl/cider-middleware)
@@ -84,11 +84,11 @@ run `cider-connect` or `cider-connect-cljs`.
[source,clojure]
----
- :cider-clj {:extra-deps {cider/cider-nrepl {:mvn/version "0.35.0"}}
+ :cider-clj {:extra-deps {cider/cider-nrepl {:mvn/version "0.35.1"}}
:main-opts ["-m" "nrepl.cmdline" "--middleware"
"[cider.nrepl/cider-middleware]"]}
:cider-cljs {:extra-deps {org.clojure/clojurescript {:mvn/version "1.10.339"}
- cider/cider-nrepl {:mvn/version "0.35.0"}
+ cider/cider-nrepl {:mvn/version "0.35.1"}
cider/piggieback {:mvn/version "0.5.3"}}
:main-opts ["-m" "nrepl.cmdline" "--middleware"
"[cider.nrepl/cider-middleware,cider.piggieback/wrap-cljs-repl]"]}
diff --git a/doc/modules/ROOT/pages/basics/up_and_running.adoc
b/doc/modules/ROOT/pages/basics/up_and_running.adoc
index 3dd4b90cc5..4818ee983d 100644
--- a/doc/modules/ROOT/pages/basics/up_and_running.adoc
+++ b/doc/modules/ROOT/pages/basics/up_and_running.adoc
@@ -67,7 +67,7 @@ simple - CIDER simply passes the extra dependencies and nREPL
configuration to
your build tool in the command it runs to start the nREPL server. Here's how
this looks for `tools.deps`:
- $ clojure -Sdeps '{:deps {nrepl {:mvn/version "0.6.0"} cider/cider-nrepl
{:mvn/version "0.35.0"}}}' -m nrepl.cmdline --middleware
'["cider.nrepl/cider-middleware"]'
+ $ clojure -Sdeps '{:deps {nrepl {:mvn/version "0.6.0"} cider/cider-nrepl
{:mvn/version "0.35.1"}}}' -m nrepl.cmdline --middleware
'["cider.nrepl/cider-middleware"]'
TIP: If you don't want `cider-jack-in` to inject dependencies automatically,
set
`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:
[source,sh]
----
-$ clj -Sdeps '{:deps {cider/cider-nrepl {:mvn/version "0.35.0"}}}' -m
nrepl.cmdline --middleware "[cider.nrepl/cider-middleware]"
+$ clj -Sdeps '{:deps {cider/cider-nrepl {:mvn/version "0.35.1"}}}' -m
nrepl.cmdline --middleware "[cider.nrepl/cider-middleware]"
----
Alternatively, you can start nREPL either manually or using the facilities
diff --git a/doc/modules/ROOT/pages/cljs/shadow-cljs.adoc
b/doc/modules/ROOT/pages/cljs/shadow-cljs.adoc
index dc47ba166e..a9a08f3916 100644
--- a/doc/modules/ROOT/pages/cljs/shadow-cljs.adoc
+++ b/doc/modules/ROOT/pages/cljs/shadow-cljs.adoc
@@ -62,7 +62,7 @@ And connect to it with `cider-connect`.
...For that to work, `shadow-cljs.edn` contents like the following are assumed:
```clj
- :dependencies [[cider/cider-nrepl "0.35.0"] ;; mandatory (unless it's
inherited from deps.edn or otherwise present in the classpath of shadow-cljs's
JVM process)
+ :dependencies [[cider/cider-nrepl "0.35.1"] ;; mandatory (unless it's
inherited from deps.edn or otherwise present in the classpath of shadow-cljs's
JVM process)
[refactor-nrepl/refactor-nrepl "3.9.0"]] ;; refactor-nrepl is
optional
: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}`
diff --git a/test/cider-tests.el b/test/cider-tests.el
index ac63645bb5..be7857c6ea 100644
--- a/test/cider-tests.el
+++ b/test/cider-tests.el
@@ -144,7 +144,7 @@
(describe "when there is a single dependency"
(before-each
(setq-local cider-injected-nrepl-version "0.9.0")
- (setq-local cider-injected-middleware-version "0.35.0")
+ (setq-local cider-injected-middleware-version "0.35.1")
(setq-local cider-jack-in-nrepl-middlewares
'("cider.nrepl/cider-middleware"))
(setq-local cider-jack-in-dependencies-exclusions '())
(setq-local cider-enrich-classpath t))
@@ -154,7 +154,7 @@
:to-equal (concat "update-in :dependencies conj "
(shell-quote-argument "[nrepl/nrepl
\"0.9.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument "[cider/cider-nrepl
\"0.35.0\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.35.1\"]")
" -- update-in :plugins conj "
(shell-quote-argument
"[mx.cider/enrich-classpath \"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -167,7 +167,7 @@
"update-in :dependencies conj "
(shell-quote-argument "[nrepl/nrepl \"0.9.0\"
:exclusions [org.clojure/clojure]]")
" -- update-in :plugins conj "
- (shell-quote-argument "[cider/cider-nrepl
\"0.35.0\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.35.1\"]")
" -- update-in :plugins conj "
(shell-quote-argument "[mx.cider/enrich-classpath
\"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -179,7 +179,7 @@
:to-equal (concat "update-in :dependencies conj "
(shell-quote-argument "[nrepl/nrepl \"0.9.0\"
:exclusions [org.clojure/clojure foo.bar/baz]]")
" -- update-in :plugins conj "
- (shell-quote-argument "[cider/cider-nrepl
\"0.35.0\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.35.1\"]")
" -- update-in :plugins conj "
(shell-quote-argument
"[mx.cider/enrich-classpath \"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -192,7 +192,7 @@
" -d "
(shell-quote-argument "nrepl/nrepl:0.9.0")
" -d "
- (shell-quote-argument "cider/cider-nrepl:0.35.0")
+ (shell-quote-argument "cider/cider-nrepl:0.35.1")
" cider.tasks/add-middleware"
" -m "
(shell-quote-argument "cider.nrepl/cider-middleware")
@@ -201,7 +201,7 @@
(it "can inject dependencies in a gradle project"
(expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl"
'gradle)
:to-equal (concat "--no-daemon "
- (shell-quote-argument
"-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.35.0")
+ (shell-quote-argument
"-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.35.1")
" :clojureRepl "
(shell-quote-argument
"--middleware=cider.nrepl/cider-middleware")))))
@@ -218,7 +218,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[refactor-nrepl
\"2.0.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument "[cider/cider-nrepl
\"0.35.0\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.35.1\"]")
" -- update-in :plugins conj "
(shell-quote-argument
"[mx.cider/enrich-classpath \"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -231,7 +231,7 @@
" -d "
(shell-quote-argument "nrepl/nrepl:0.9.0")
" -d "
- (shell-quote-argument
"cider/cider-nrepl:0.35.0")
+ (shell-quote-argument
"cider/cider-nrepl:0.35.1")
" -d "
(shell-quote-argument "refactor-nrepl:2.0.0")
" cider.tasks/add-middleware"
@@ -253,7 +253,7 @@
:to-equal (concat "-o -U update-in :dependencies conj "
(shell-quote-argument "[nrepl/nrepl
\"0.9.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument "[cider/cider-nrepl
\"0.35.0\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.35.1\"]")
" -- update-in :plugins conj "
(shell-quote-argument
"[mx.cider/enrich-classpath \"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -264,7 +264,7 @@
" -d "
(shell-quote-argument "nrepl/nrepl:0.9.0")
" -d "
- (shell-quote-argument
"cider/cider-nrepl:0.35.0")
+ (shell-quote-argument
"cider/cider-nrepl:0.35.1")
" cider.tasks/add-middleware"
" -m "
(shell-quote-argument
"cider.nrepl/cider-middleware")
@@ -272,7 +272,7 @@
(it "can concat in a gradle project"
(expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl"
'gradle)
:to-equal (concat "--no-daemon "
- (shell-quote-argument
"-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.35.0")
+ (shell-quote-argument
"-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.35.1")
" :clojureRepl "
(shell-quote-argument
"--middleware=cider.nrepl/cider-middleware")))))
@@ -287,14 +287,14 @@
(setq-local cider-jack-in-nrepl-middlewares
'(("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate)
"cider.nrepl/cider-middleware" ("another/middleware"))))
(it "includes plugins whose predicates return true"
(expect (cider-jack-in-normalized-lein-plugins)
- :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl"
"0.35.0"))))
+ :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl"
"0.35.1"))))
(it "includes middlewares whose predicates return true"
(expect (cider-jack-in-normalized-nrepl-middlewares)
:to-equal '("refactor-nrepl.middleware/wrap-refactor"
"cider.nrepl/cider-middleware" "another/middleware")))
(it "ignores plugins whose predicates return false"
(spy-on 'plugins-predicate :and-return-value nil)
(expect (cider-jack-in-normalized-lein-plugins)
- :to-equal '(("cider/cider-nrepl" "0.35.0")))
+ :to-equal '(("cider/cider-nrepl" "0.35.1")))
(spy-on 'middlewares-predicate :and-return-value nil)
(expect (cider-jack-in-normalized-nrepl-middlewares)
:to-equal '("cider.nrepl/cider-middleware"
"another/middleware")))
@@ -323,7 +323,7 @@
:and-return-value '("refactor-nrepl.middleware/wrap-refactor"
"cider.nrepl/cider-middleware"))
(spy-on 'cider-jack-in-normalized-lein-plugins
:and-return-value '(("refactor-nrepl" "2.0.0")
- ("cider/cider-nrepl" "0.35.0")
+ ("cider/cider-nrepl" "0.35.1")
("mx.cider/enrich-classpath" "1.9.0")))
(setq-local cider-jack-in-dependencies-exclusions '())
(setq-local cider-enrich-classpath t))
@@ -334,7 +334,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[refactor-nrepl
\"2.0.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument "[cider/cider-nrepl
\"0.35.0\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.35.1\"]")
" -- update-in :plugins conj "
(shell-quote-argument
"[mx.cider/enrich-classpath \"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -352,7 +352,7 @@
" -d "
(shell-quote-argument "nrepl/nrepl:0.9.0")
" -d "
- (shell-quote-argument
"cider/cider-nrepl:0.35.0")
+ (shell-quote-argument
"cider/cider-nrepl:0.35.1")
" -d "
(shell-quote-argument "refactor-nrepl:2.0.0")
" cider.tasks/add-middleware"
@@ -447,7 +447,7 @@
(setq-local cider-jack-in-dependencies nil)
(setq-local cider-jack-in-nrepl-middlewares
'("cider.nrepl/cider-middleware"))
(let ((expected (string-join `("clojure -Sdeps "
- ,(shell-quote-argument "{:deps
{nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version
\"0.35.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\"
\"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
+ ,(shell-quote-argument "{:deps
{nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version
\"0.35.1\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\"
\"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
" -M:cider/nrepl")
"")))
(setq-local cider-allow-jack-in-without-project t)
@@ -461,7 +461,7 @@
(it "allows specifying custom aliases with `cider-clojure-cli-aliases`"
(let ((expected (string-join `("clojure -Sdeps "
- ,(shell-quote-argument "{:deps
{nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version
\"0.35.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\"
\"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
+ ,(shell-quote-argument "{:deps
{nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version
\"0.35.1\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\"
\"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
" -M:dev:test:cider/nrepl")
"")))
(setq-local cider-jack-in-dependencies nil)
@@ -478,7 +478,7 @@
(it (format "should remove duplicates, yielding the same result (for %S
command invocation)" command)
;; repeat the same test for PowerShell too
(let ((expected (string-join `("-Sdeps "
- ,(cider--shell-quote-argument "{:deps
{cider/cider-nrepl {:mvn/version \"0.35.0\"} nrepl/nrepl {:mvn/version
\"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\"
\"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}"
+ ,(cider--shell-quote-argument "{:deps
{cider/cider-nrepl {:mvn/version \"0.35.1\"} nrepl/nrepl {:mvn/version
\"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\"
\"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}"
command)
" -M:dev:test:cider/nrepl")
"")))
@@ -488,7 +488,7 @@
:to-equal expected))))
(it "handles aliases correctly"
(let ((expected (string-join `("-Sdeps "
- ,(shell-quote-argument "{:deps
{cider/cider-nrepl {:mvn/version \"0.35.0\"} nrepl/nrepl {:mvn/version
\"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\"
\"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
+ ,(shell-quote-argument "{:deps
{cider/cider-nrepl {:mvn/version \"0.35.1\"} nrepl/nrepl {:mvn/version
\"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\"
\"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
" -M:test:cider/nrepl")
""))
(deps '(("nrepl/nrepl" "0.9.0"))))
@@ -510,7 +510,7 @@
:to-equal expected)))))
(it "allows for global options"
(let ((expected (string-join `("-J-Djdk.attach.allowAttachSelf -Sdeps "
- ,(shell-quote-argument "{:deps
{cider/cider-nrepl {:mvn/version \"0.35.0\"} nrepl/nrepl {:mvn/version
\"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\"
\"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
+ ,(shell-quote-argument "{:deps
{cider/cider-nrepl {:mvn/version \"0.35.1\"} nrepl/nrepl {:mvn/version
\"0.9.0\"}} :aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\"
\"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
" -M:test:cider/nrepl")
""))
(deps '(("nrepl/nrepl" "0.9.0"))))
@@ -521,7 +521,7 @@
(setq-local cider-jack-in-dependencies '(("org.clojure/tools.deps"
(("git/sha" . "6ae2b6f71773de7549d7f22759e8b09fec27f0d9")
("git/url" . "https://github.com/clojure/tools.deps/";)))))
(let ((expected (string-join `("clojure -Sdeps "
- ,(shell-quote-argument "{:deps
{nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version
\"0.35.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]\"]}}}")
+ ,(shell-quote-argument "{:deps
{nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version
\"0.35.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]\"]}}}")
" -M:cider/nrepl")
"")))
(setq-local cider-allow-jack-in-without-project t)
