branch: elpa/cider
commit 57d1dc19ffbe11e5fc2d9c58f90107e051c43ded
Author: vemv <[email protected]>
Commit: GitHub <[email protected]>
Bump the injected `enrich-classpath` to 1.18.5 (#3584)
Closes https://github.com/clojure-emacs/cider/issues/3581
https://github.com/clojure-emacs/enrich-classpath/compare/v1.18.4...v1.18.5
---
CHANGELOG.md | 2 ++
cider.el | 2 +-
clojure.sh | 2 +-
doc/modules/ROOT/pages/config/basic_config.adoc | 2 +-
test/cider-tests.el | 14 +++++++-------
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56c851feca..ecb2b0936a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
- 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.
- [#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.
- As defined in the newly introduced `cider-test-var-keymap` var.
+- [#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).
+ - Handles Clojure CLI `:paths` directly defined as `:aliases`.
## 1.11.1 (2023-11-11)
diff --git a/cider.el b/cider.el
index cc234dcc05..6d81697ac0 100644
--- a/cider.el
+++ b/cider.el
@@ -598,7 +598,7 @@ returned by this function does not include keyword
arguments."
(let ((plugins (if cider-enrich-classpath
(append cider-jack-in-lein-plugins
`(("cider/cider-nrepl"
,cider-injected-middleware-version)
- ("mx.cider/lein-enrich-classpath" "1.18.4")))
+ ("mx.cider/lein-enrich-classpath" "1.18.5")))
(append cider-jack-in-lein-plugins
`(("cider/cider-nrepl"
,cider-injected-middleware-version))))))
(thread-last
diff --git a/clojure.sh b/clojure.sh
index c3c7f6a78d..fe79af2640 100755
--- a/clojure.sh
+++ b/clojure.sh
@@ -37,7 +37,7 @@ else
cd "$there"
# enrich-classpath will emit a command starting by "clojure", or print a
stacktrace:
- 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" "$@")
+ 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" "$@")
cmd=$(tail -n1 <(echo "$output"))
cd "$here"
diff --git a/doc/modules/ROOT/pages/config/basic_config.adoc
b/doc/modules/ROOT/pages/config/basic_config.adoc
index 90b4584b49..eeae0ba3dd 100644
--- a/doc/modules/ROOT/pages/config/basic_config.adoc
+++ b/doc/modules/ROOT/pages/config/basic_config.adoc
@@ -44,7 +44,7 @@ With it enabled, `cider-jack-in` will activate
enrich-classpath, given the follo
* You are on macOS/Linux
* You are launching a vanilla JVM repl (and not a cljs repl, or a clj+cljs
repl)
* You are using `cider-jack-in` / `cider-jack-in-clj` (and not `cider-connect`)
- ** For `cider-connect`, please follow enrich-classpath's
https://github.com/clojure-emacs/enrich-classpath/tree/v1.18.4#emacs-cider-connect[own
instructions].
+ ** For `cider-connect`, please follow enrich-classpath's
https://github.com/clojure-emacs/enrich-classpath/tree/v1.18.5#emacs-cider-connect[own
instructions].
...these conditions will be progressively relaxed.
diff --git a/test/cider-tests.el b/test/cider-tests.el
index 21d336471e..8bb8ba0084 100644
--- a/test/cider-tests.el
+++ b/test/cider-tests.el
@@ -156,7 +156,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl
\"0.43.3\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.4\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
" -- update-in :middleware conj
cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless")))
@@ -169,7 +169,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl
\"0.43.3\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.4\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
" -- update-in :middleware conj
cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless")))
@@ -181,7 +181,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl
\"0.43.3\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.4\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
" -- update-in :middleware conj
cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless")))
@@ -220,7 +220,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl
\"0.43.3\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.4\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
" -- update-in :middleware conj
cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless")))
@@ -255,7 +255,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl
\"0.43.3\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.4\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
" -- update-in :middleware conj
cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless")))
(it "can concat in a boot project"
@@ -324,7 +324,7 @@
(spy-on 'cider-jack-in-normalized-lein-plugins
:and-return-value '(("refactor-nrepl" "2.0.0")
("cider/cider-nrepl" "0.43.3")
- ("mx.cider/lein-enrich-classpath" "1.18.4")))
+ ("mx.cider/lein-enrich-classpath" "1.18.5")))
(setq-local cider-jack-in-dependencies-exclusions '())
(setq-local cider-enrich-classpath t))
(it "uses them in a lein project"
@@ -336,7 +336,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl
\"0.43.3\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.4\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
" -- update-in :middleware conj
cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless"))))
