Skip to content

Commit

Permalink
Use Enrich 1.15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vemv committed Aug 25, 2023
1 parent 2ac806d commit 7ba5d80
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion cider.el
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,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.14.0")))
("mx.cider/lein-enrich-classpath" "1.15.0")))
(append cider-jack-in-lein-plugins
`(("cider/cider-nrepl" ,cider-injected-middleware-version))))))
(thread-last
Expand Down
2 changes: 1 addition & 1 deletion clojure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.0"}}}' -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.15.0"}}}' -M -m cider.enrich-classpath.clojure "$clojure" "$here" "true" "$@")
cmd=$(tail -n1 <(echo "$output"))

cd "$here"
Expand Down
14 changes: 7 additions & 7 deletions test/cider-tests.el
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl \"0.36.0\"]")
" -- update-in :plugins conj "
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.14.0\"]")
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.15.0\"]")
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless")))

Expand All @@ -169,7 +169,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl \"0.36.0\"]")
" -- update-in :plugins conj "
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.14.0\"]")
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.15.0\"]")
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless")))

Expand All @@ -181,7 +181,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl \"0.36.0\"]")
" -- update-in :plugins conj "
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.14.0\"]")
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.15.0\"]")
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless")))

Expand Down Expand Up @@ -220,7 +220,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl \"0.36.0\"]")
" -- update-in :plugins conj "
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.14.0\"]")
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.15.0\"]")
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless")))

Expand Down Expand Up @@ -255,7 +255,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl \"0.36.0\"]")
" -- update-in :plugins conj "
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.14.0\"]")
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.15.0\"]")
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless")))
(it "can concat in a boot project"
Expand Down Expand Up @@ -324,7 +324,7 @@
(spy-on 'cider-jack-in-normalized-lein-plugins
:and-return-value '(("refactor-nrepl" "2.0.0")
("cider/cider-nrepl" "0.36.0")
("mx.cider/lein-enrich-classpath" "1.14.0")))
("mx.cider/lein-enrich-classpath" "1.15.0")))
(setq-local cider-jack-in-dependencies-exclusions '())
(setq-local cider-enrich-classpath t))
(it "uses them in a lein project"
Expand All @@ -336,7 +336,7 @@
" -- update-in :plugins conj "
(shell-quote-argument "[cider/cider-nrepl \"0.36.0\"]")
" -- update-in :plugins conj "
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.14.0\"]")
(shell-quote-argument "[mx.cider/lein-enrich-classpath \"1.15.0\"]")
" -- update-in :middleware conj cider.enrich-classpath.plugin-v2/middleware"
" -- repl :headless"))))

Expand Down

0 comments on commit 7ba5d80

Please sign in to comment.