branch: elpa/cider
commit af7d9e148343420c165b4a1e37794e46d55d2b1b
Author: vemv <v...@users.noreply.github.com>
Commit: Bozhidar Batsov <bozhi...@batsov.dev>
Use cider-nrepl 0.28.4
https://github.com/clojure-emacs/cider-nrepl/blob/v0.28.4/CHANGELOG.md#0284-2022-05-18
---
CHANGELOG.md | 4 +++
cider.el | 2 +-
.../ROOT/pages/basics/middleware_setup.adoc | 2 +-
test/cider-tests.el | 38 +++++++++++-----------
4 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c45d489d15..18ab6b3f86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
## master (unreleased)
+## Changes
+
+* Upgrade cider-nrepl to
[0.28.4](https://github.com/clojure-emacs/cider-nrepl/blob/v0.28.4/CHANGELOG.md#0284-2022-05-18).
+
### Bugs fixed
* [#3195](https://github.com/clojure-emacs/cider/issues/3195): Revert the
change that resulted in `(error "Cyclic keymap inheritance")` on
`cider-test-run-test`.
diff --git a/cider.el b/cider.el
index 63b875dba6..95a449e804 100644
--- a/cider.el
+++ b/cider.el
@@ -416,7 +416,7 @@ the artifact.")
(defconst cider-latest-clojure-version "1.10.1"
"Latest supported version of Clojure.")
-(defconst cider-required-middleware-version "0.28.3"
+(defconst cider-required-middleware-version "0.28.4"
"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 eb6abcdaaf..259542f228 100644
--- a/doc/modules/ROOT/pages/basics/middleware_setup.adoc
+++ b/doc/modules/ROOT/pages/basics/middleware_setup.adoc
@@ -45,7 +45,7 @@ A minimal `profiles.clj` for CIDER would be:
[source,clojure]
----
-{:repl {:plugins [[cider/cider-nrepl "0.28.3"]
+{:repl {:plugins [[cider/cider-nrepl "0.28.4"]
[mx.cider/enrich-classpath "1.9.0"]]}}
----
diff --git a/test/cider-tests.el b/test/cider-tests.el
index bcd000e6c0..7abb7b30a1 100644
--- a/test/cider-tests.el
+++ b/test/cider-tests.el
@@ -112,7 +112,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.28.3")
+ (setq-local cider-injected-middleware-version "0.28.4")
(setq-local cider-jack-in-nrepl-middlewares
'("cider.nrepl/cider-middleware"))
(setq-local cider-jack-in-dependencies-exclusions '())
(setq-local cider-enrich-classpath t))
@@ -122,7 +122,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.28.3\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.28.4\"]")
" -- update-in :plugins conj "
(shell-quote-argument
"[mx.cider/enrich-classpath \"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -135,7 +135,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.28.3\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.28.4\"]")
" -- update-in :plugins conj "
(shell-quote-argument "[mx.cider/enrich-classpath
\"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -147,7 +147,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.28.3\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.28.4\"]")
" -- update-in :plugins conj "
(shell-quote-argument
"[mx.cider/enrich-classpath \"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -160,7 +160,7 @@
" -d "
(shell-quote-argument "nrepl/nrepl:0.9.0")
" -d "
- (shell-quote-argument "cider/cider-nrepl:0.28.3")
+ (shell-quote-argument "cider/cider-nrepl:0.28.4")
" cider.tasks/add-middleware"
" -m "
(shell-quote-argument "cider.nrepl/cider-middleware")
@@ -183,7 +183,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[refactor-nrepl
\"2.0.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument "[cider/cider-nrepl
\"0.28.3\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.28.4\"]")
" -- update-in :plugins conj "
(shell-quote-argument
"[mx.cider/enrich-classpath \"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -196,7 +196,7 @@
" -d "
(shell-quote-argument "nrepl/nrepl:0.9.0")
" -d "
- (shell-quote-argument
"cider/cider-nrepl:0.28.3")
+ (shell-quote-argument
"cider/cider-nrepl:0.28.4")
" -d "
(shell-quote-argument "refactor-nrepl:2.0.0")
" cider.tasks/add-middleware"
@@ -218,7 +218,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.28.3\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.28.4\"]")
" -- update-in :plugins conj "
(shell-quote-argument
"[mx.cider/enrich-classpath \"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -229,7 +229,7 @@
" -d "
(shell-quote-argument "nrepl/nrepl:0.9.0")
" -d "
- (shell-quote-argument
"cider/cider-nrepl:0.28.3")
+ (shell-quote-argument
"cider/cider-nrepl:0.28.4")
" cider.tasks/add-middleware"
" -m "
(shell-quote-argument
"cider.nrepl/cider-middleware")
@@ -249,14 +249,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.28.3"))))
+ :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl"
"0.28.4"))))
(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.28.3")))
+ :to-equal '(("cider/cider-nrepl" "0.28.4")))
(spy-on 'middlewares-predicate :and-return-value nil)
(expect (cider-jack-in-normalized-nrepl-middlewares)
:to-equal '("cider.nrepl/cider-middleware"
"another/middleware")))
@@ -285,7 +285,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.28.3")
+ ("cider/cider-nrepl" "0.28.4")
("mx.cider/enrich-classpath" "1.9.0")))
(setq-local cider-jack-in-dependencies-exclusions '())
(setq-local cider-enrich-classpath t))
@@ -296,7 +296,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[refactor-nrepl
\"2.0.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument "[cider/cider-nrepl
\"0.28.3\"]")
+ (shell-quote-argument "[cider/cider-nrepl
\"0.28.4\"]")
" -- update-in :plugins conj "
(shell-quote-argument
"[mx.cider/enrich-classpath \"1.9.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath/middleware"
@@ -314,7 +314,7 @@
" -d "
(shell-quote-argument "nrepl/nrepl:0.9.0")
" -d "
- (shell-quote-argument
"cider/cider-nrepl:0.28.3")
+ (shell-quote-argument
"cider/cider-nrepl:0.28.4")
" -d "
(shell-quote-argument "refactor-nrepl:2.0.0")
" cider.tasks/add-middleware"
@@ -401,7 +401,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 '{:deps {nrepl/nrepl
{:mvn/version \"0.9.0\"} "
- "cider/cider-nrepl {:mvn/version
\"0.28.3\"}} "
+ "cider/cider-nrepl {:mvn/version
\"0.28.4\"}} "
":aliases {:cider/nrepl {:main-opts
[\"-m\" \"nrepl.cmdline\" \"--middleware\""
" \"[cider.nrepl/cider-middleware]\"]}}}'
-M:cider/nrepl")
"")))
@@ -416,7 +416,7 @@
(it "allows specifying custom aliases with `cider-clojure-cli-aliases`"
(let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl
{:mvn/version \"0.9.0\"} "
- "cider/cider-nrepl {:mvn/version
\"0.28.3\"}} "
+ "cider/cider-nrepl {:mvn/version
\"0.28.4\"}} "
":aliases {:cider/nrepl {:main-opts
[\"-m\" \"nrepl.cmdline\" \"--middleware\""
" \"[cider.nrepl/cider-middleware]\"]}}}'
-M:dev:test:cider/nrepl")
"")))
@@ -430,7 +430,7 @@
(expect (plist-get (cider--update-jack-in-cmd nil) :jack-in-cmd)
:to-equal expected)))
(it "should remove duplicates, yielding the same result"
- (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl
{:mvn/version \"0.28.3\"} "
+ (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl
{:mvn/version \"0.28.4\"} "
"nrepl/nrepl {:mvn/version \"0.9.0\"}} "
":aliases {:cider/nrepl {:main-opts
[\"-m\" \"nrepl.cmdline\" \"--middleware\""
"
\"[cider.nrepl/cider-middleware]\"]}}}' -M:dev:test:cider/nrepl")
@@ -439,7 +439,7 @@
("nrepl/nrepl" "0.9.0")))
:to-equal expected)))
(it "handles aliases correctly"
- (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl
{:mvn/version \"0.28.3\"} "
+ (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl
{:mvn/version \"0.28.4\"} "
"nrepl/nrepl {:mvn/version \"0.9.0\"}} "
":aliases {:cider/nrepl {:main-opts
[\"-m\" \"nrepl.cmdline\" \"--middleware\""
" \"[cider.nrepl/cider-middleware]\"]}}}'
-M:test:cider/nrepl")
@@ -462,7 +462,7 @@
(expect (cider-clojure-cli-jack-in-dependencies nil nil deps)
:to-equal expected)))))
(it "allows for global options"
- (let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps
'{:deps {cider/cider-nrepl {:mvn/version \"0.28.3\"} "
+ (let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps
'{:deps {cider/cider-nrepl {:mvn/version \"0.28.4\"} "
"nrepl/nrepl {:mvn/version \"0.9.0\"}} "
":aliases {:cider/nrepl {:main-opts
[\"-m\" \"nrepl.cmdline\" \"--middleware\""
" \"[cider.nrepl/cider-middleware]\"]}}}'
-M:test:cider/nrepl")
