emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/cider 4856be1af8 3/8: Use enrich-classpath 1.18.6


From: ELPA Syncer
Subject: [nongnu] elpa/cider 4856be1af8 3/8: Use enrich-classpath 1.18.6
Date: Fri, 24 Nov 2023 06:59:05 -0500 (EST)

branch: elpa/cider
commit 4856be1af880bbc3d5ed3122640e601b1499587b
Author: vemv <vemv@users.noreply.github.com>
Commit: vemv <vemv@users.noreply.github.com>

    Use enrich-classpath 1.18.6
---
 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, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afa0b7be74..5270689b98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@
 - [#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.
 - [#3582](https://github.com/clojure-emacs/cider/issues/3582): Handle 
`cider-clojure-compilation-error-phases` values that have been customized to 
`t`.
-- [#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).
+- [#3581](https://github.com/clojure-emacs/cider/issues/3581): Bump the 
injected `enrich-classpath` to 
[1.18.6](https://github.com/clojure-emacs/enrich-classpath/compare/v1.18.4...v1.18.6).
   - Handles Clojure CLI `:paths` directly defined as `:aliases`.
 - Bump the `clojure-mode` required version to 
[5.18.1](https://github.com/clojure-emacs/clojure-mode/blob/v5.18.1/CHANGELOG.md#5181-2023-11-24).
 - Bump the injected `cider-nrepl` to 
[0.44.0](https://github.com/clojure-emacs/cider-nrepl/blob/44da162f51765464192ba04102398c5982f01638/CHANGELOG.md#0440-2023-11-24).
diff --git a/cider.el b/cider.el
index 366b68434a..cd5d28a1e2 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.5")))
+                               ("mx.cider/lein-enrich-classpath" "1.18.6")))
                    (append cider-jack-in-lein-plugins
                            `(("cider/cider-nrepl" 
,cider-injected-middleware-version))))))
     (thread-last
diff --git a/clojure.sh b/clojure.sh
index fe79af2640..f20a4f76b2 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.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.18.6"}}}' -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 eeae0ba3dd..5d09c59d9c 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.5#emacs-cider-connect[own
 instructions].
+ ** For `cider-connect`, please follow enrich-classpath's 
https://github.com/clojure-emacs/enrich-classpath/tree/v1.18.6#emacs-cider-connect[own
 instructions].
 
 ...these conditions will be progressively relaxed.
 
diff --git a/test/cider-tests.el b/test/cider-tests.el
index 56ba541d16..d89db352e1 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.44.0\"]")
                                 " -- update-in :plugins conj "
-                                (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
+                                (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.6\"]")
                                 " -- 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.44.0\"]")
                          " -- update-in :plugins conj "
-                         (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
+                         (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.6\"]")
                          " -- 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.44.0\"]")
                                 " -- update-in :plugins conj "
-                                (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
+                                (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.6\"]")
                                 " -- 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.44.0\"]")
                                 " -- update-in :plugins conj "
-                                (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
+                                (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.6\"]")
                                 " -- 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.44.0\"]")
                                 " -- update-in :plugins conj "
-                                (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
+                                (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.6\"]")
                                 " -- 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.44.0")
-                                  ("mx.cider/lein-enrich-classpath" "1.18.5")))
+                                  ("mx.cider/lein-enrich-classpath" "1.18.6")))
       (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.44.0\"]")
                                 " -- update-in :plugins conj "
-                                (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.5\"]")
+                                (shell-quote-argument 
"[mx.cider/lein-enrich-classpath \"1.18.6\"]")
                                 " -- update-in :middleware conj 
cider.enrich-classpath.plugin-v2/middleware"
                                 " -- repl :headless"))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]