Skip to content

Commit af7d9e1

Browse files
vemvbbatsov
vemv
authored and
bbatsov
committed
Use cider-nrepl 0.28.4
https://github.com/clojure-emacs/cider-nrepl/blob/v0.28.4/CHANGELOG.md#0284-2022-05-18
1 parent e86f2f7 commit af7d9e1

File tree

4 files changed

+25
-21
lines changed

4 files changed

+25
-21
lines changed

‎CHANGELOG.md‎

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

33
## master (unreleased)
44

5+
## Changes
6+
7+
* Upgrade cider-nrepl to [0.28.4](https://github.com/clojure-emacs/cider-nrepl/blob/v0.28.4/CHANGELOG.md#0284-2022-05-18).
8+
59
### Bugs fixed
610

711
* [#3195](https://github.com/clojure-emacs/cider/issues/3195): Revert the change that resulted in `(error "Cyclic keymap inheritance")` on `cider-test-run-test`.

‎cider.el‎

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

419-
(defconst cider-required-middleware-version "0.28.3"
419+
(defconst cider-required-middleware-version "0.28.4"
420420
"The CIDER nREPL version that's known to work properly with CIDER.")
421421

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ A minimal `profiles.clj` for CIDER would be:
4545

4646
[source,clojure]
4747
----
48-
{:repl {:plugins [[cider/cider-nrepl "0.28.3"]
48+
{:repl {:plugins [[cider/cider-nrepl "0.28.4"]
4949
[mx.cider/enrich-classpath "1.9.0"]]}}
5050
----
5151

‎test/cider-tests.el‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
(describe "when there is a single dependency"
113113
(before-each
114114
(setq-local cider-injected-nrepl-version "0.9.0")
115-
(setq-local cider-injected-middleware-version "0.28.3")
115+
(setq-local cider-injected-middleware-version "0.28.4")
116116
(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
117117
(setq-local cider-jack-in-dependencies-exclusions '())
118118
(setq-local cider-enrich-classpath t))
@@ -122,7 +122,7 @@
122122
:to-equal (concat "update-in :dependencies conj "
123123
(shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
124124
" -- update-in :plugins conj "
125-
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
125+
(shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]")
126126
" -- update-in :plugins conj "
127127
(shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
128128
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -135,7 +135,7 @@
135135
"update-in :dependencies conj "
136136
(shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure]]")
137137
" -- update-in :plugins conj "
138-
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
138+
(shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]")
139139
" -- update-in :plugins conj "
140140
(shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
141141
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -147,7 +147,7 @@
147147
:to-equal (concat "update-in :dependencies conj "
148148
(shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure foo.bar/baz]]")
149149
" -- update-in :plugins conj "
150-
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
150+
(shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]")
151151
" -- update-in :plugins conj "
152152
(shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
153153
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -160,7 +160,7 @@
160160
" -d "
161161
(shell-quote-argument "nrepl/nrepl:0.9.0")
162162
" -d "
163-
(shell-quote-argument "cider/cider-nrepl:0.28.3")
163+
(shell-quote-argument "cider/cider-nrepl:0.28.4")
164164
" cider.tasks/add-middleware"
165165
" -m "
166166
(shell-quote-argument "cider.nrepl/cider-middleware")
@@ -183,7 +183,7 @@
183183
" -- update-in :plugins conj "
184184
(shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
185185
" -- update-in :plugins conj "
186-
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
186+
(shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]")
187187
" -- update-in :plugins conj "
188188
(shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
189189
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -196,7 +196,7 @@
196196
" -d "
197197
(shell-quote-argument "nrepl/nrepl:0.9.0")
198198
" -d "
199-
(shell-quote-argument "cider/cider-nrepl:0.28.3")
199+
(shell-quote-argument "cider/cider-nrepl:0.28.4")
200200
" -d "
201201
(shell-quote-argument "refactor-nrepl:2.0.0")
202202
" cider.tasks/add-middleware"
@@ -218,7 +218,7 @@
218218
:to-equal (concat "-o -U update-in :dependencies conj "
219219
(shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
220220
" -- update-in :plugins conj "
221-
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
221+
(shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]")
222222
" -- update-in :plugins conj "
223223
(shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
224224
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -229,7 +229,7 @@
229229
" -d "
230230
(shell-quote-argument "nrepl/nrepl:0.9.0")
231231
" -d "
232-
(shell-quote-argument "cider/cider-nrepl:0.28.3")
232+
(shell-quote-argument "cider/cider-nrepl:0.28.4")
233233
" cider.tasks/add-middleware"
234234
" -m "
235235
(shell-quote-argument "cider.nrepl/cider-middleware")
@@ -249,14 +249,14 @@
249249
(setq-local cider-jack-in-nrepl-middlewares '(("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate) "cider.nrepl/cider-middleware" ("another/middleware"))))
250250
(it "includes plugins whose predicates return true"
251251
(expect (cider-jack-in-normalized-lein-plugins)
252-
:to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.28.3"))))
252+
:to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.28.4"))))
253253
(it "includes middlewares whose predicates return true"
254254
(expect (cider-jack-in-normalized-nrepl-middlewares)
255255
:to-equal '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware" "another/middleware")))
256256
(it "ignores plugins whose predicates return false"
257257
(spy-on 'plugins-predicate :and-return-value nil)
258258
(expect (cider-jack-in-normalized-lein-plugins)
259-
:to-equal '(("cider/cider-nrepl" "0.28.3")))
259+
:to-equal '(("cider/cider-nrepl" "0.28.4")))
260260
(spy-on 'middlewares-predicate :and-return-value nil)
261261
(expect (cider-jack-in-normalized-nrepl-middlewares)
262262
:to-equal '("cider.nrepl/cider-middleware" "another/middleware")))
@@ -285,7 +285,7 @@
285285
:and-return-value '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware"))
286286
(spy-on 'cider-jack-in-normalized-lein-plugins
287287
:and-return-value '(("refactor-nrepl" "2.0.0")
288-
("cider/cider-nrepl" "0.28.3")
288+
("cider/cider-nrepl" "0.28.4")
289289
("mx.cider/enrich-classpath" "1.9.0")))
290290
(setq-local cider-jack-in-dependencies-exclusions '())
291291
(setq-local cider-enrich-classpath t))
@@ -296,7 +296,7 @@
296296
" -- update-in :plugins conj "
297297
(shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
298298
" -- update-in :plugins conj "
299-
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
299+
(shell-quote-argument "[cider/cider-nrepl \"0.28.4\"]")
300300
" -- update-in :plugins conj "
301301
(shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
302302
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -314,7 +314,7 @@
314314
" -d "
315315
(shell-quote-argument "nrepl/nrepl:0.9.0")
316316
" -d "
317-
(shell-quote-argument "cider/cider-nrepl:0.28.3")
317+
(shell-quote-argument "cider/cider-nrepl:0.28.4")
318318
" -d "
319319
(shell-quote-argument "refactor-nrepl:2.0.0")
320320
" cider.tasks/add-middleware"
@@ -401,7 +401,7 @@
401401
(setq-local cider-jack-in-dependencies nil)
402402
(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
403403
(let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
404-
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
404+
"cider/cider-nrepl {:mvn/version \"0.28.4\"}} "
405405
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
406406
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:cider/nrepl")
407407
"")))
@@ -416,7 +416,7 @@
416416

417417
(it "allows specifying custom aliases with `cider-clojure-cli-aliases`"
418418
(let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
419-
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
419+
"cider/cider-nrepl {:mvn/version \"0.28.4\"}} "
420420
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
421421
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:dev:test:cider/nrepl")
422422
"")))
@@ -430,7 +430,7 @@
430430
(expect (plist-get (cider--update-jack-in-cmd nil) :jack-in-cmd)
431431
:to-equal expected)))
432432
(it "should remove duplicates, yielding the same result"
433-
(let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.3\"} "
433+
(let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.4\"} "
434434
"nrepl/nrepl {:mvn/version \"0.9.0\"}} "
435435
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
436436
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:dev:test:cider/nrepl")
@@ -439,7 +439,7 @@
439439
("nrepl/nrepl" "0.9.0")))
440440
:to-equal expected)))
441441
(it "handles aliases correctly"
442-
(let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.3\"} "
442+
(let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.4\"} "
443443
"nrepl/nrepl {:mvn/version \"0.9.0\"}} "
444444
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
445445
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")
@@ -462,7 +462,7 @@
462462
(expect (cider-clojure-cli-jack-in-dependencies nil nil deps)
463463
:to-equal expected)))))
464464
(it "allows for global options"
465-
(let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.3\"} "
465+
(let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps '{:deps {cider/cider-nrepl {:mvn/version \"0.28.4\"} "
466466
"nrepl/nrepl {:mvn/version \"0.9.0\"}} "
467467
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
468468
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")

0 commit comments

Comments
 (0)