Skip to content

Commit e6a5789

Browse files
committed
Bump the injected enrich-classpath to 1.18.5
Closes #3581 clojure-emacs/enrich-classpath@v1.18.4...v1.18.5
1 parent 017ecc8 commit e6a5789

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

Diff for: CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
- CIDER [Inspector](https://docs.cider.mx/cider/debugging/inspector.html): retain [`truncate-lines`](https://www.gnu.org/software/emacs/manual/html_node/emacs/Line-Truncation.html) values across screens.
99
- [#3580](https://github.com/clojure-emacs/cider/issues/3580): `cider-test`: make test vars in [test results reports](https://docs.cider.mx/cider/testing/test_reports.html) clickable.
1010
- As defined in the newly introduced `cider-test-var-keymap` var.
11+
- [#3581](https://github.com/clojure-emacs/cider/issues/3581): Bump the injected `enrich-classpath` to [1.18.5](https://github.com/clojure-emacs/enrich-classpath/compare/v1.18.4...v1.18.5).
12+
- Handles Clojure CLI `:paths` directly defined as `:aliases`.
1113

1214
## 1.11.1 (2023-11-11)
1315

Diff for: cider.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ returned by this function does not include keyword arguments."
598598
(let ((plugins (if cider-enrich-classpath
599599
(append cider-jack-in-lein-plugins
600600
`(("cider/cider-nrepl" ,cider-injected-middleware-version)
601-
("mx.cider/lein-enrich-classpath" "1.18.4")))
601+
("mx.cider/lein-enrich-classpath" "1.18.5")))
602602
(append cider-jack-in-lein-plugins
603603
`(("cider/cider-nrepl" ,cider-injected-middleware-version))))))
604604
(thread-last

Diff for: clojure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ else
3737
cd "$there"
3838

3939
# enrich-classpath will emit a command starting by "clojure", or print a stacktrace:
40-
output=$(2>&1 "$clojure" -Sforce -Srepro -J-XX:-OmitStackTraceInFastThrow -J-Dclojure.main.report=stderr -Sdeps '{:deps {mx.cider/tools.deps.enrich-classpath {:mvn/version "1.18.4"}}}' -M -m cider.enrich-classpath.clojure "$clojure" "$here" "true" "$@")
40+
output=$(2>&1 "$clojure" -Sforce -Srepro -J-XX:-OmitStackTraceInFastThrow -J-Dclojure.main.report=stderr -Sdeps '{:deps {mx.cider/tools.deps.enrich-classpath {:mvn/version "1.18.5"}}}' -M -m cider.enrich-classpath.clojure "$clojure" "$here" "true" "$@")
4141
cmd=$(tail -n1 <(echo "$output"))
4242

4343
cd "$here"

Diff for: doc/modules/ROOT/pages/config/basic_config.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ With it enabled, `cider-jack-in` will activate enrich-classpath, given the follo
4444
* You are on macOS/Linux
4545
* You are launching a vanilla JVM repl (and not a cljs repl, or a clj+cljs repl)
4646
* You are using `cider-jack-in` / `cider-jack-in-clj` (and not `cider-connect`)
47-
** For `cider-connect`, please follow enrich-classpath's https://github.com/clojure-emacs/enrich-classpath/tree/v1.18.4#emacs-cider-connect[own instructions].
47+
** For `cider-connect`, please follow enrich-classpath's https://github.com/clojure-emacs/enrich-classpath/tree/v1.18.5#emacs-cider-connect[own instructions].
4848

4949
...these conditions will be progressively relaxed.
5050

Diff for: test/cider-tests.el

+7-7
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
" -- update-in :plugins conj "
157157
(shell-quote-argument "[cider/cider-nrepl \"0.43.3\"]")
158158
" -- update-in :plugins conj "
159-
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.4\"]")
159+
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.5\"]")
160160
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
161161
" -- repl :headless")))
162162

@@ -169,7 +169,7 @@
169169
" -- update-in :plugins conj "
170170
(shell-quote-argument "[cider/cider-nrepl \"0.43.3\"]")
171171
" -- update-in :plugins conj "
172-
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.4\"]")
172+
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.5\"]")
173173
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
174174
" -- repl :headless")))
175175

@@ -181,7 +181,7 @@
181181
" -- update-in :plugins conj "
182182
(shell-quote-argument "[cider/cider-nrepl \"0.43.3\"]")
183183
" -- update-in :plugins conj "
184-
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.4\"]")
184+
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.5\"]")
185185
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
186186
" -- repl :headless")))
187187

@@ -220,7 +220,7 @@
220220
" -- update-in :plugins conj "
221221
(shell-quote-argument "[cider/cider-nrepl \"0.43.3\"]")
222222
" -- update-in :plugins conj "
223-
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.4\"]")
223+
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.5\"]")
224224
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
225225
" -- repl :headless")))
226226

@@ -255,7 +255,7 @@
255255
" -- update-in :plugins conj "
256256
(shell-quote-argument "[cider/cider-nrepl \"0.43.3\"]")
257257
" -- update-in :plugins conj "
258-
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.4\"]")
258+
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.5\"]")
259259
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
260260
" -- repl :headless")))
261261
(it "can concat in a boot project"
@@ -324,7 +324,7 @@
324324
(spy-on 'cider-jack-in-normalized-lein-plugins
325325
:and-return-value '(("refactor-nrepl" "2.0.0")
326326
("cider/cider-nrepl" "0.43.3")
327-
("mx.cider/lein-enrich-classpath" "1.18.4")))
327+
("mx.cider/lein-enrich-classpath" "1.18.5")))
328328
(setq-local cider-jack-in-dependencies-exclusions '())
329329
(setq-local cider-enrich-classpath t))
330330
(it "uses them in a lein project"
@@ -336,7 +336,7 @@
336336
" -- update-in :plugins conj "
337337
(shell-quote-argument "[cider/cider-nrepl \"0.43.3\"]")
338338
" -- update-in :plugins conj "
339-
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.4\"]")
339+
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.5\"]")
340340
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
341341
" -- repl :headless"))))
342342

0 commit comments

Comments
 (0)