branch: elpa/cider
commit ec7bec85c995d8d9afe2289a1d5f7e84ff868a4c
Author: vemv <v...@users.noreply.github.com>
Commit: vemv <v...@users.noreply.github.com>
Use and document enrich-classpath 1.16.0
---
cider.el | 2 +-
clojure.sh | 2 +-
doc/modules/ROOT/pages/config/basic_config.adoc | 3 ++-
test/cider-tests.el | 14 +++++++-------
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/cider.el b/cider.el
index c6febb2046..1d4aaa5737 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.15.5")))
+ ("mx.cider/lein-enrich-classpath" "1.16.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 7164a8d189..ffddb78370 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.15.5"}}}' -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.16.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 f843dc83d4..53efd7f5df 100644
--- a/doc/modules/ROOT/pages/config/basic_config.adoc
+++ b/doc/modules/ROOT/pages/config/basic_config.adoc
@@ -29,7 +29,7 @@ buffers. You can override this behavior, however:
== Use `enrich-classpath`
-`enrich-classpath` is a program/plugin/wrapper that allows CIDER to access to
the sources and javadocs of a given project's Java files: your own files, those
from your dependencies, and those from the JDK.
+https://github.com/clojure-emacs/enrich-classpath[`enrich-classpath`] is a
program/plugin/wrapper that allows CIDER to access to the sources and javadocs
of a given project's Java files: your own files, those from your dependencies,
and those from the JDK.
With that, CIDER can show better completions, navigation, documentation, and
stacktrace integration.
@@ -44,6 +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.16.0#emacs-cider-connect[own
instructions].
...those conditions will be progressively relaxed.
diff --git a/test/cider-tests.el b/test/cider-tests.el
index 6a46dbc2a1..78ededffd1 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.37.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.15.5\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.16.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.37.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.15.5\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.16.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.37.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.15.5\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.16.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.37.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.15.5\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.16.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.37.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.15.5\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.16.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.37.0")
- ("mx.cider/lein-enrich-classpath" "1.15.5")))
+ ("mx.cider/lein-enrich-classpath" "1.16.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.37.0\"]")
" -- update-in :plugins conj "
- (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.15.5\"]")
+ (shell-quote-argument
"[mx.cider/lein-enrich-classpath \"1.16.0\"]")
" -- update-in :middleware conj
cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless"))))
