Skip to content

Commit fddaa87

Browse files
alexander-yakushevbbatsov
alexander-yakushev
authored and
bbatsov
committed
Reduce number of places where versions need to be updated
1 parent ba5ca6c commit fddaa87

File tree

3 files changed

+43
-31
lines changed

3 files changed

+43
-31
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ NOTE: Make sure you're using https://github.com/clojurephant/clojurephant[Clojur
6565
[source, groovy]
6666
----
6767
dependencies {
68-
devImplementation 'nrepl:nrepl:0.9.0'
68+
devImplementation 'nrepl:nrepl:1.3.1'
6969
devImplementation 'cider:cider-nrepl:0.55.7'
7070
}
7171

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ The command tunnels as well the remote port 12345 to local machine on port 12345
450450
----
451451
ssh -t -L 12345:localhost:12345 MY_REMOTE_SERVER \
452452
devcontainer exec --workspace-folder /home/me/my-clj-code \
453-
"clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.8.3\"} cider/cider-nrepl {:mvn/version \"0.25.5\"}}}' -m nrepl.cmdline -p 12345 -b 0.0.0.0 --middleware '[\"cider.nrepl/cider-middleware\"]' "
453+
"clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"1.3.1\"} cider/cider-nrepl {:mvn/version \"0.55.7\"}}}' -m nrepl.cmdline -p 12345 -b 0.0.0.0 --middleware '[\"cider.nrepl/cider-middleware\"]' "
454454
----
455455

456456
For this to work, we need as well to configure `devcontainer.json` with a snippet that exposes port `12345` from the container to the (remote) host:

‎test/cider-tests.el‎

Lines changed: 41 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,18 @@
143143

144144
(describe "when there is a single dependency"
145145
(before-each
146-
(setq-local cider-injected-nrepl-version "0.9.0")
147-
(setq-local cider-injected-middleware-version "0.55.7")
146+
(setq-local cider-injected-nrepl-version "1.2.3")
147+
(setq-local cider-injected-middleware-version "2.3.4")
148148
(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
149149
(setq-local cider-jack-in-dependencies-exclusions '())
150150
(setq-local cider-enable-nrepl-jvmti-agent t))
151151

152152
(it "can inject dependencies in a lein project"
153153
(expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
154154
:to-equal (concat "update-in :dependencies conj "
155-
(shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
155+
(shell-quote-argument "[nrepl/nrepl \"1.2.3\"]")
156156
" -- update-in :plugins conj "
157-
(shell-quote-argument "[cider/cider-nrepl \"0.55.7\"]")
157+
(shell-quote-argument "[cider/cider-nrepl \"2.3.4\"]")
158158
" -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
159159
" -- repl :headless")))
160160

@@ -163,27 +163,27 @@
163163
(expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
164164
:to-equal (concat
165165
"update-in :dependencies conj "
166-
(shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure]]")
166+
(shell-quote-argument "[nrepl/nrepl \"1.2.3\" :exclusions [org.clojure/clojure]]")
167167
" -- update-in :plugins conj "
168-
(shell-quote-argument "[cider/cider-nrepl \"0.55.7\"]")
168+
(shell-quote-argument "[cider/cider-nrepl \"2.3.4\"]")
169169
" -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
170170
" -- repl :headless")))
171171

172172
(it "can inject dependencies in a lein project with multiple exclusions"
173173
(setq-local cider-jack-in-dependencies-exclusions '(("nrepl/nrepl" ("org.clojure/clojure" "foo.bar/baz"))))
174174
(expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
175175
:to-equal (concat "update-in :dependencies conj "
176-
(shell-quote-argument "[nrepl/nrepl \"0.9.0\" :exclusions [org.clojure/clojure foo.bar/baz]]")
176+
(shell-quote-argument "[nrepl/nrepl \"1.2.3\" :exclusions [org.clojure/clojure foo.bar/baz]]")
177177
" -- update-in :plugins conj "
178-
(shell-quote-argument "[cider/cider-nrepl \"0.55.7\"]")
178+
(shell-quote-argument "[cider/cider-nrepl \"2.3.4\"]")
179179
" -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
180180
" -- repl :headless")))
181181

182182
(it "can inject dependencies in a gradle project"
183183
(expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 'gradle)
184184
:to-equal (concat "--no-daemon "
185185
"-Pjdk.attach.allowAttachSelf "
186-
(shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.55.7")
186+
(shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:1.2.3,cider:cider-nrepl:2.3.4")
187187
" :clojureRepl "
188188
(shell-quote-argument "--middleware=cider.nrepl/cider-middleware")))))
189189

@@ -196,11 +196,11 @@
196196
(it "can inject dependencies in a lein project"
197197
(expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
198198
:to-equal (concat "update-in :dependencies conj "
199-
(shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
199+
(shell-quote-argument "[nrepl/nrepl \"1.2.3\"]")
200200
" -- update-in :plugins conj "
201201
(shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
202202
" -- update-in :plugins conj "
203-
(shell-quote-argument "[cider/cider-nrepl \"0.55.7\"]")
203+
(shell-quote-argument "[cider/cider-nrepl \"2.3.4\"]")
204204
" -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
205205
" -- repl :headless"))))
206206

@@ -214,16 +214,16 @@
214214
(it "can concat in a lein project"
215215
(expect (cider-inject-jack-in-dependencies "-o -U" "repl :headless" 'lein)
216216
:to-equal (concat "-o -U update-in :dependencies conj "
217-
(shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
217+
(shell-quote-argument "[nrepl/nrepl \"1.2.3\"]")
218218
" -- update-in :plugins conj "
219-
(shell-quote-argument "[cider/cider-nrepl \"0.55.7\"]")
219+
(shell-quote-argument "[cider/cider-nrepl \"2.3.4\"]")
220220
" -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
221221
" -- repl :headless")))
222222
(it "can concat in a gradle project"
223223
(expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 'gradle)
224224
:to-equal (concat "--no-daemon "
225225
"-Pjdk.attach.allowAttachSelf "
226-
(shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.55.7")
226+
(shell-quote-argument "-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:1.2.3,cider:cider-nrepl:2.3.4")
227227
" :clojureRepl "
228228
(shell-quote-argument "--middleware=cider.nrepl/cider-middleware")))))
229229

@@ -237,14 +237,14 @@
237237
(setq-local cider-jack-in-nrepl-middlewares '(("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate) "cider.nrepl/cider-middleware" ("another/middleware"))))
238238
(it "includes plugins whose predicates return true"
239239
(expect (cider-jack-in-normalized-lein-plugins)
240-
:to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.55.7"))))
240+
:to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "2.3.4"))))
241241
(it "includes middlewares whose predicates return true"
242242
(expect (cider-jack-in-normalized-nrepl-middlewares)
243243
:to-equal '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware" "another/middleware")))
244244
(it "ignores plugins whose predicates return false"
245245
(spy-on 'plugins-predicate :and-return-value nil)
246246
(expect (cider-jack-in-normalized-lein-plugins)
247-
:to-equal '(("cider/cider-nrepl" "0.55.7")))
247+
:to-equal '(("cider/cider-nrepl" "2.3.4")))
248248
(spy-on 'middlewares-predicate :and-return-value nil)
249249
(expect (cider-jack-in-normalized-nrepl-middlewares)
250250
:to-equal '("cider.nrepl/cider-middleware" "another/middleware")))
@@ -273,16 +273,16 @@
273273
:and-return-value '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware"))
274274
(spy-on 'cider-jack-in-normalized-lein-plugins
275275
:and-return-value '(("refactor-nrepl" "2.0.0")
276-
("cider/cider-nrepl" "0.55.7")))
276+
("cider/cider-nrepl" "2.3.4")))
277277
(setq-local cider-jack-in-dependencies-exclusions '()))
278278
(it "uses them in a lein project"
279279
(expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
280280
:to-equal (concat "update-in :dependencies conj "
281-
(shell-quote-argument "[nrepl/nrepl \"0.9.0\"]")
281+
(shell-quote-argument "[nrepl/nrepl \"1.2.3\"]")
282282
" -- update-in :plugins conj "
283283
(shell-quote-argument "[refactor-nrepl \"2.0.0\"]")
284284
" -- update-in :plugins conj "
285-
(shell-quote-argument "[cider/cider-nrepl \"0.55.7\"]")
285+
(shell-quote-argument "[cider/cider-nrepl \"2.3.4\"]")
286286
" -- update-in :jvm-opts conj '\"-Djdk.attach.allowAttachSelf\"'"
287287
" -- repl :headless")))))
288288

@@ -370,8 +370,10 @@
370370
(it "uses main opts in an alias to prevent other mains from winning"
371371
(setq-local cider-jack-in-dependencies nil)
372372
(setq-local cider-jack-in-nrepl-middlewares '("cider.nrepl/cider-middleware"))
373+
(setq-local cider-injected-nrepl-version "1.2.3")
374+
(setq-local cider-injected-middleware-version "2.3.4")
373375
(let ((expected (string-join `("clojure -Sdeps "
374-
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.55.7\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
376+
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"1.2.3\"} cider/cider-nrepl {:mvn/version \"2.3.4\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
375377
" -M:cider/nrepl")
376378
"")))
377379
(setq-local cider-allow-jack-in-without-project t)
@@ -385,8 +387,10 @@
385387
:to-equal expected)))
386388

387389
(it "allows specifying custom aliases with `cider-clojure-cli-aliases`"
390+
(setq-local cider-injected-nrepl-version "1.2.3")
391+
(setq-local cider-injected-middleware-version "2.3.4")
388392
(let ((expected (string-join `("clojure -Sdeps "
389-
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.55.7\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
393+
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"1.2.3\"} cider/cider-nrepl {:mvn/version \"2.3.4\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
390394
" -M:dev:test:cider/nrepl")
391395
"")))
392396
(setq-local cider-jack-in-dependencies nil)
@@ -402,22 +406,26 @@
402406

403407
(dolist (command '("clojure" "powershell"))
404408
(it (format "should remove duplicates, yielding the same result (for %S command invocation)" command)
409+
(setq-local cider-injected-nrepl-version "1.2.3")
410+
(setq-local cider-injected-middleware-version "2.3.4")
405411
;; repeat the same test for PowerShell too
406412
(let ((expected (string-join `("-Sdeps "
407-
,(cider--shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.55.7\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}"
413+
,(cider--shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"2.3.4\"} nrepl/nrepl {:mvn/version \"1.2.3\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}"
408414
command)
409415
" -M:dev:test:cider/nrepl")
410416
"")))
411-
(expect (cider-clojure-cli-jack-in-dependencies nil nil '(("nrepl/nrepl" "0.9.0")
412-
("nrepl/nrepl" "0.9.0"))
417+
(expect (cider-clojure-cli-jack-in-dependencies nil nil '(("nrepl/nrepl" "1.2.3")
418+
("nrepl/nrepl" "1.2.3"))
413419
command)
414420
:to-equal expected))))
415421
(it "handles aliases correctly"
422+
(setq-local cider-injected-nrepl-version "1.2.3")
423+
(setq-local cider-injected-middleware-version "2.3.4")
416424
(let ((expected (string-join `("-Sdeps "
417-
,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.55.7\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
425+
,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"2.3.4\"} nrepl/nrepl {:mvn/version \"1.2.3\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
418426
" -M:test:cider/nrepl")
419427
""))
420-
(deps '(("nrepl/nrepl" "0.9.0"))))
428+
(deps '(("nrepl/nrepl" "1.2.3"))))
421429
(let ((cider-clojure-cli-aliases ":test"))
422430
(expect (cider-clojure-cli-jack-in-dependencies nil nil deps)
423431
:to-equal expected))
@@ -441,19 +449,23 @@
441449
(expect (cider-clojure-cli-jack-in-dependencies nil nil deps)
442450
:to-equal expected)))))
443451
(it "allows for global options"
452+
(setq-local cider-injected-nrepl-version "1.2.3")
453+
(setq-local cider-injected-middleware-version "2.3.4")
444454
(let ((expected (string-join `("-J-Xverify:none -Sdeps "
445-
,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"0.55.7\"} nrepl/nrepl {:mvn/version \"0.9.0\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
455+
,(shell-quote-argument "{:deps {cider/cider-nrepl {:mvn/version \"2.3.4\"} nrepl/nrepl {:mvn/version \"1.2.3\"}} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
446456
" -M:test:cider/nrepl")
447457
""))
448-
(deps '(("nrepl/nrepl" "0.9.0"))))
458+
(deps '(("nrepl/nrepl" "1.2.3"))))
449459
(let ((cider-clojure-cli-aliases ":test"))
450460
(expect (cider-clojure-cli-jack-in-dependencies "-J-Xverify:none" nil deps)
451461
:to-equal expected))))
452462
(it "allows to specify git coordinate as cider-jack-in-dependency"
463+
(setq-local cider-injected-nrepl-version "1.2.3")
464+
(setq-local cider-injected-middleware-version "2.3.4")
453465
(setq-local cider-jack-in-dependencies '(("org.clojure/tools.deps" (("git/sha" . "6ae2b6f71773de7549d7f22759e8b09fec27f0d9")
454466
("git/url" . "https://github.com/clojure/tools.deps/")))))
455467
(let ((expected (string-join `("clojure -Sdeps "
456-
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"0.9.0\"} cider/cider-nrepl {:mvn/version \"0.55.7\"} org.clojure/tools.deps { :git/sha \"6ae2b6f71773de7549d7f22759e8b09fec27f0d9\" :git/url \"https://github.com/clojure/tools.deps/\" }} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
468+
,(shell-quote-argument "{:deps {nrepl/nrepl {:mvn/version \"1.2.3\"} cider/cider-nrepl {:mvn/version \"2.3.4\"} org.clojure/tools.deps { :git/sha \"6ae2b6f71773de7549d7f22759e8b09fec27f0d9\" :git/url \"https://github.com/clojure/tools.deps/\" }} :aliases {:cider/nrepl {:jvm-opts [\"-Djdk.attach.allowAttachSelf\"], :main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[cider.nrepl/cider-middleware]\"]}}}")
457469
" -M:cider/nrepl")
458470
"")))
459471
(setq-local cider-allow-jack-in-without-project t)

0 commit comments

Comments
 (0)