Skip to content

Commit 7a072d8

Browse files
vemvvemv
authored
Upgrade cider-nrepl to 0.28.3 (#3158)
1 parent 956984f commit 7a072d8

File tree

4 files changed

+22
-21
lines changed

4 files changed

+22
-21
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* [#3149](https://github.com/clojure-emacs/cider/pull/3149): Add option `'change` to `cider-eval-result-duration`, allowing multiple eval result overlays to persist until the next change to the buffer.
1111
* `cider-jack-in-lein-plugins` no longer affects non-Leiningen projects.
1212
* Third-party packages should rely on `cider-jack-in-dependencies` instead.
13+
* Upgrade cider-nrepl to [0.28.3](https://github.com/clojure-emacs/cider-nrepl/blob/v0.28.3/CHANGELOG.md#0283-2022-02-22).
1314

1415
### Bugs fixed
1516

‎cider.el‎

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

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

421421
(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.2"]
48+
{:repl {:plugins [[cider/cider-nrepl "0.28.3"]
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.1")
115+
(setq-local cider-injected-middleware-version "0.28.3")
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.1\"]")
125+
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
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.1\"]")
138+
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
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.1\"]")
150+
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
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.1")
163+
(shell-quote-argument "cider/cider-nrepl:0.28.3")
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.1\"]")
186+
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
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.1")
199+
(shell-quote-argument "cider/cider-nrepl:0.28.3")
200200
" -d "
201201
(shell-quote-argument "refactor-nrepl:2.0.0")
202202
" cider.tasks/add-middleware"
@@ -217,7 +217,7 @@
217217
:to-equal (concat "-o -U update-in :dependencies conj "
218218
(shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
219219
" -- update-in :plugins conj "
220-
(shell-quote-argument "[cider/cider-nrepl \"0.28.1\"]")
220+
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
221221
" -- update-in :plugins conj "
222222
(shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
223223
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -228,7 +228,7 @@
228228
" -d "
229229
(shell-quote-argument "nrepl/nrepl:0.9.0")
230230
" -d "
231-
(shell-quote-argument "cider/cider-nrepl:0.28.1")
231+
(shell-quote-argument "cider/cider-nrepl:0.28.3")
232232
" cider.tasks/add-middleware"
233233
" -m "
234234
(shell-quote-argument "cider.nrepl/cider-middleware")
@@ -248,14 +248,14 @@
248248
(setq-local cider-jack-in-nrepl-middlewares '(("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate) "cider.nrepl/cider-middleware" ("another/middleware"))))
249249
(it "includes plugins whose predicates return true"
250250
(expect (cider-jack-in-normalized-lein-plugins)
251-
:to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.28.1"))))
251+
:to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.28.3"))))
252252
(it "includes middlewares whose predicates return true"
253253
(expect (cider-jack-in-normalized-nrepl-middlewares)
254254
:to-equal '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware" "another/middleware")))
255255
(it "ignores plugins whose predicates return false"
256256
(spy-on 'plugins-predicate :and-return-value nil)
257257
(expect (cider-jack-in-normalized-lein-plugins)
258-
:to-equal '(("cider/cider-nrepl" "0.28.1")))
258+
:to-equal '(("cider/cider-nrepl" "0.28.3")))
259259
(spy-on 'middlewares-predicate :and-return-value nil)
260260
(expect (cider-jack-in-normalized-nrepl-middlewares)
261261
:to-equal '("cider.nrepl/cider-middleware" "another/middleware")))
@@ -284,7 +284,7 @@
284284
:and-return-value '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware"))
285285
(spy-on 'cider-jack-in-normalized-lein-plugins
286286
:and-return-value '(("refactor-nrepl" "2.0.0")
287-
("cider/cider-nrepl" "0.28.1")
287+
("cider/cider-nrepl" "0.28.3")
288288
("mx.cider/enrich-classpath" "1.9.0")))
289289
(setq-local cider-jack-in-dependencies-exclusions '())
290290
(setq-local cider-enrich-classpath t))
@@ -295,7 +295,7 @@
295295
" -- update-in :plugins conj "
296296
(shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
297297
" -- update-in :plugins conj "
298-
(shell-quote-argument "[cider/cider-nrepl \"0.28.1\"]")
298+
(shell-quote-argument "[cider/cider-nrepl \"0.28.3\"]")
299299
" -- update-in :plugins conj "
300300
(shell-quote-argument "[mx.cider/enrich-classpath \"1.9.0\"]")
301301
" -- update-in :middleware conj cider.enrich-classpath/middleware"
@@ -313,7 +313,7 @@
313313
" -d "
314314
(shell-quote-argument "nrepl/nrepl:0.9.0")
315315
" -d "
316-
(shell-quote-argument "cider/cider-nrepl:0.28.1")
316+
(shell-quote-argument "cider/cider-nrepl:0.28.3")
317317
" -d "
318318
(shell-quote-argument "refactor-nrepl:2.0.0")
319319
" cider.tasks/add-middleware"
@@ -399,7 +399,7 @@
399399
(it "uses main opts in an alias to prevent other mains from winning"
400400
(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
401401
(let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
402-
"cider/cider-nrepl {:mvn/version \"0.28.1\"}} "
402+
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
403403
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
404404
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:cider/nrepl")
405405
"")))
@@ -413,7 +413,7 @@
413413
:to-equal expected)))
414414
(it "allows specifying custom aliases with `cider-clojure-cli-aliases`"
415415
(let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
416-
"cider/cider-nrepl {:mvn/version \"0.28.1\"}} "
416+
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
417417
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
418418
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:dev:test:cider/nrepl")
419419
"")))
@@ -426,7 +426,7 @@
426426
(expect (plist-get (cider--update-jack-in-cmd nil) :jack-in-cmd)
427427
:to-equal expected)))
428428
(let ((expected (string-join '("-Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
429-
"cider/cider-nrepl {:mvn/version \"0.28.1\"}} "
429+
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
430430
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
431431
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:cider/nrepl")
432432
"")))
@@ -436,7 +436,7 @@
436436
:to-equal expected)))
437437
(it "handles aliases correctly"
438438
(let ((expected (string-join '("-Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
439-
"cider/cider-nrepl {:mvn/version \"0.28.1\"}} "
439+
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
440440
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
441441
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")
442442
""))
@@ -459,7 +459,7 @@
459459
:to-equal expected)))))
460460
(it "allows for global options"
461461
(let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} "
462-
"cider/cider-nrepl {:mvn/version \"0.28.1\"}} "
462+
"cider/cider-nrepl {:mvn/version \"0.28.3\"}} "
463463
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
464464
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")
465465
""))

0 commit comments

Comments
 (0)