From 1cd6ab7b7cb4a7e079a273600c4d28307c3aba40 Mon Sep 17 00:00:00 2001 From: vemv Date: Wed, 24 Apr 2024 21:19:50 +0200 Subject: [PATCH] Use enrich-classpath 1.19.3 (#3649) https://github.com/clojure-emacs/enrich-classpath/compare/v1.19.0...v1.19.3 --- CHANGELOG.md | 1 + cider.el | 2 +- clojure.sh | 2 +- doc/modules/ROOT/pages/config/basic_config.adoc | 2 +- test/cider-tests.el | 14 +++++++------- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea5387440..2c79e2810 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - [#3626](https://github.com/clojure-emacs/cider/issues/3626): `cider-ns-refresh`: jump to the relevant file/line on errors. - [#3628](https://github.com/clojure-emacs/cider/issues/3628): `cider-ns-refresh`: summarize errors as an overlay. +- Bump the injected `enrich-classpath` to [1.19.3](https://github.com/clojure-emacs/enrich-classpath/compare/v1.19.0...v1.19.3). - Bump the injected nREPL to [1.1.1](https://github.com/nrepl/nrepl/blob/v1.1.1/CHANGELOG.md#111-2024-02-20). - Bump the injected `cider-nrepl` to [0.47.0](https://github.com/clojure-emacs/cider-nrepl/blob/v0.47.0/CHANGELOG.md#0470-2024-03-10). - Updates [Orchard](https://github.com/clojure-emacs/orchard/blob/v0.23.2/CHANGELOG.md#0232-2024-03-10). diff --git a/cider.el b/cider.el index 3873bfee7..8a7586803 100644 --- a/cider.el +++ b/cider.el @@ -612,7 +612,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.19.2"))) + ("mx.cider/lein-enrich-classpath" "1.19.3"))) (append cider-jack-in-lein-plugins `(("cider/cider-nrepl" ,cider-injected-middleware-version)))))) (thread-last plugins diff --git a/clojure.sh b/clojure.sh index dc25a2bb2..ee1d96769 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.19.2"}}}' -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.19.3"}}}' -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 4bb6fd636..c5d260462 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.19.2#emacs-cider-connect[own instructions]. + ** For `cider-connect`, please follow enrich-classpath's https://github.com/clojure-emacs/enrich-classpath/tree/v1.19.3#emacs-cider-connect[own instructions]. ...these conditions will be progressively relaxed. diff --git a/test/cider-tests.el b/test/cider-tests.el index 115f7e37a..64bc4e760 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.47.0\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") " -- 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.47.0\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") " -- 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.47.0\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") " -- 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.47.0\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") " -- 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.47.0\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") " -- 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.47.0") - ("mx.cider/lein-enrich-classpath" "1.19.2"))) + ("mx.cider/lein-enrich-classpath" "1.19.3"))) (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.47.0\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.19.3\"]") " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware" " -- repl :headless"))))