diff --git a/cider.el b/cider.el index 9675ae3c8..291bfed51 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.17.2"))) + ("mx.cider/lein-enrich-classpath" "1.18.0"))) (append cider-jack-in-lein-plugins `(("cider/cider-nrepl" ,cider-injected-middleware-version)))))) (thread-last diff --git a/clojure.sh b/clojure.sh index 9fa50611c..b8f15921a 100755 --- a/clojure.sh +++ b/clojure.sh @@ -28,7 +28,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.17.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.18.0"}}}' -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 b0b6b6230..e2b66a23c 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.17.2#emacs-cider-connect[own instructions]. + ** For `cider-connect`, please follow enrich-classpath's https://github.com/clojure-emacs/enrich-classpath/tree/v1.18.0#emacs-cider-connect[own instructions]. ...these conditions will be progressively relaxed. diff --git a/test/cider-tests.el b/test/cider-tests.el index bf61c9585..9d8735f68 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.38.1\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.17.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.0\"]") " -- 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.38.1\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.17.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.0\"]") " -- 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.38.1\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.17.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.0\"]") " -- 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.38.1\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.17.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.0\"]") " -- 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.38.1\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.17.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.0\"]") " -- 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.38.1") - ("mx.cider/lein-enrich-classpath" "1.17.2"))) + ("mx.cider/lein-enrich-classpath" "1.18.0"))) (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.38.1\"]") " -- update-in :plugins conj " - (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.17.2\"]") + (shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.18.0\"]") " -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware" " -- repl :headless"))))