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

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

[nongnu] elpa/cider 19124d4dc0 4/4: Merge pull request #3228 from ajober


From: ELPA Syncer
Subject: [nongnu] elpa/cider 19124d4dc0 4/4: Merge pull request #3228 from ajoberstar/gradle-inject
Date: Sat, 30 Jul 2022 23:58:08 -0400 (EDT)

branch: elpa/cider
commit 19124d4dc03f093d28e728d6512de66943f1c62d
Merge: 6f2d3ba53b 486a924eb1
Author: vemv <vemv@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #3228 from ajoberstar/gradle-inject
    
    Support injecting dependencies into Gradle
---
 CHANGELOG.md                                       |  1 +
 cider.el                                           | 51 +++++++++++++-
 .../ROOT/pages/basics/middleware_setup.adoc        | 24 ++++++-
 doc/modules/ROOT/pages/basics/up_and_running.adoc  |  6 +-
 doc/modules/ROOT/pages/cljs/configuration.adoc     |  2 +
 doc/modules/ROOT/pages/cljs/up_and_running.adoc    | 15 ++++
 test/cider-tests.el                                | 82 +++++++++++++++-------
 7 files changed, 147 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88d73f8c6d..3855285918 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [#3226](https://github.com/clojure-emacs/cider/pull/3226): Populate 
completions metadata, making it possible to change the style of completion via 
`completion-category-override` or `completion-category-defaults`.
 - [#2946](https://github.com/clojure-emacs/cider/issues/2946): Add custom var 
`cider-merge-sessions` to allow combining sessions in two different ways: 
Setting `cider-merge-sessions` to `'host` will merge all sessions associated 
with the same host within a project. Setting it to `'project` will combine all 
sessions of a project irrespective of their host.
 - Support Gradle jack-in via the Gradle wrapper, instead of just a globally 
installed `gradle` on the `PATH`.
+- Gradle projects can now inject dependencies and middleware as with other 
build tools (dependency injection requires 
[Clojurephant](https://github.com/clojurephant/clojurephant) 0.7.0-alpha.6 or 
higher)
 
 ## Changes
 
diff --git a/cider.el b/cider.el
index 2f65c98d10..0c64251b7a 100644
--- a/cider.el
+++ b/cider.el
@@ -577,6 +577,49 @@ and MIDDLEWARES.  PARAMS and MIDDLEWARES are passed on to
           (cider-boot-dependencies (append 
(cider--jack-in-required-dependencies) dependencies))
           (cider-boot-middleware-task params middlewares)))
 
+(defun cider--gradle-dependency-notation (dependency)
+  "Returns Gradle's GAV dependency syntax.
+For a \"group/artifact\" \"version\") DEPENDENCY list
+return as group:artifact:version notation."
+  (let ((group-artifact (replace-regexp-in-string "/" ":" (car dependency)))
+        (version (cadr dependency)))
+    (format "%s:%s" group-artifact version)))
+
+(defun cider--gradle-jack-in-property (dependencies)
+  "Returns Clojurephant's dependency jack-in property.
+For DEPENDENCIES, translates to Gradle's dependency notation
+using `cider--gradle-dependency-notation`.''"
+  (if (seq-empty-p dependencies)
+      ""
+    (shell-quote-argument
+     (concat "-Pdev.clojurephant.jack-in.nrepl="
+             (mapconcat #'cider--gradle-dependency-notation dependencies 
",")))))
+
+(defun cider--gradle-middleware-params (middlewares)
+  "Returns Gradle-formatted middleware params.
+Given a list of MIDDLEWARES symbols, this returns
+the Gradle parameters expected by Clojurephant's
+ClojureNRepl task."
+  (mapconcat (lambda (middleware)
+               (shell-quote-argument (concat "--middleware=" middleware)))
+             middlewares
+             " "))
+
+(defun cider-gradle-jack-in-dependencies (global-opts params dependencies 
middlewares)
+  "Create gradle jack in dependencies.
+Does so by concatenating GLOBAL-OPTS, DEPENDENCIES,
+and MIDDLEWARES.  GLOBAL-OPTS and PARAMS are taken as-is.
+DEPENDENCIES are translated into Gradle's typical
+group:artifact:version notation and MIDDLEWARES are
+prepared as arguments to Clojurephant's ClojureNRepl task."
+  (concat global-opts
+          (unless (seq-empty-p global-opts) " ")
+          (cider--gradle-jack-in-property (append 
(cider--jack-in-required-dependencies) dependencies))
+          " "
+          params
+          (unless (seq-empty-p params) " ")
+          (cider--gradle-middleware-params middlewares)))
+
 (defun cider--lein-artifact-exclusions (exclusions)
   "Return an exclusions vector described by the elements of EXCLUSIONS."
   (if exclusions
@@ -717,10 +760,12 @@ dependencies."
                    params
                    (cider-add-clojure-dependencies-maybe
                     cider-jack-in-dependencies)))
-    ('gradle (concat
+    ('gradle (cider-gradle-jack-in-dependencies
               global-opts
-              (unless (seq-empty-p global-opts) " ")
-              params))
+              params
+              (cider-add-clojure-dependencies-maybe
+               cider-jack-in-dependencies)
+              (cider-jack-in-normalized-nrepl-middlewares)))
     (_ (error "Unsupported project type `%S'" project-type))))
 
 
diff --git a/doc/modules/ROOT/pages/basics/middleware_setup.adoc 
b/doc/modules/ROOT/pages/basics/middleware_setup.adoc
index 259542f228..df9e54b9f2 100644
--- a/doc/modules/ROOT/pages/basics/middleware_setup.adoc
+++ b/doc/modules/ROOT/pages/basics/middleware_setup.adoc
@@ -12,7 +12,8 @@ automatically injects this middleware and other dependencies 
as required.
 NOTE: In the past, if you were setting up CIDER, you might have had to
 modify `profiles.clj` or `profile.boot`. CIDER now handles
 everything automatically and you don't need to add anything
-special to these files. The same is true of your `deps.edn` file.
+special to these files. The same is true of your `deps.edn` file and
+your `build.gradle` (as of Clojurephant 0.7.0-alpha.6).
 
 If you prefer a standalone REPL, you will need to invoke
 `cider-connect` instead of `cider-jack-in` and manually add the
@@ -45,7 +46,7 @@ A minimal `profiles.clj` for CIDER would be:
 
 [source,clojure]
 ----
-{:repl {:plugins [[cider/cider-nrepl "0.28.4"]
+{:repl {:plugins [[cider/cider-nrepl "0.28.5"]
                   [mx.cider/enrich-classpath "1.9.0"]]}}
 ----
 
@@ -95,7 +96,24 @@ run `cider-connect` or `cider-connect-cljs`.
 
 === Using Gradle
 
-NOTE: This section is currently a stub. Contributions welcome!
+NOTE: Make sure you're using 
https://github.com/clojurephant/clojurephant[Clojurephant] 0.4.0 or newer.
+
+.build.gradle
+[source, groovy]
+----
+dependencies {
+  devImplementation 'nrepl:nrepl:0.9.0'
+  devImplementation 'cider:cider-nrepl:0.28.5'
+}
+
+tasks.named('clojureRepl') {
+  middleware = ['cider.nrepl/cider-middleware']
+}
+----
+
+You can then launch the nREPL server from the command line via: `./gradlew 
clojureRepl`.
+
+For more information, see the https://clojurephant.dev[Clojurephant docs].
 
 === Using Maven
 
diff --git a/doc/modules/ROOT/pages/basics/up_and_running.adoc 
b/doc/modules/ROOT/pages/basics/up_and_running.adoc
index c435a5e151..dc4725f79c 100644
--- a/doc/modules/ROOT/pages/basics/up_and_running.adoc
+++ b/doc/modules/ROOT/pages/basics/up_and_running.adoc
@@ -88,6 +88,8 @@ Here's how you can modify the injected dependencies for 
`cider-jack-in-clj`:
                     "foo/bar" "1.0")
 ----
 
+IMPORTANT: Always use the fully qualified `group/artifact` (e.g. 
`re-frame/re-frame`) in these dependencies, since only Leiningen supports the 
bare `re-frame` syntax.
+
 CIDER will also inject the most recent version of nREPL that it supports. This 
is a simple
 trick to override the version of nREPL bundled with your build tool (e.g. 
Leiningen), so you can gain
 access to the newest nREPL features. Generally that's one aspect of CIDER's 
inner workings
@@ -104,10 +106,6 @@ for example, if your project defaults to an older version 
of Clojure than that
 supported by the CIDER middleware. Set `cider-jack-in-auto-inject-clojure`
 appropriately to enable this.
 
-NOTE: CIDER does not currently support
-dependency auto-injection for Gradle projects. Unfortunately there's no
-way to pass extra dependencies to Gradle via its command-line interface.
-
 === Jacking-in without a Project
 
 If you try to run `cider-jack-in` outside a project
diff --git a/doc/modules/ROOT/pages/cljs/configuration.adoc 
b/doc/modules/ROOT/pages/cljs/configuration.adoc
index 89f6ea1770..1ef79bde74 100644
--- a/doc/modules/ROOT/pages/cljs/configuration.adoc
+++ b/doc/modules/ROOT/pages/cljs/configuration.adoc
@@ -17,6 +17,8 @@ variable. Here's an example:
 (cider-add-to-alist 'cider-jack-in-cljs-dependencies "weasel/weasel" "0.7.1")
 ----
 
+IMPORTANT: Always use the fully qualified `group/artifact` (e.g. 
`re-frame/re-frame`) in these dependencies, since only Leiningen supports the 
bare `re-frame` syntax.
+
 Typically, modifying this variable is not needed, as ClojureScript 
dependencies are declared
 explicitly in your project configuration most of the time.
 
diff --git a/doc/modules/ROOT/pages/cljs/up_and_running.adoc 
b/doc/modules/ROOT/pages/cljs/up_and_running.adoc
index 69cbcbb28d..2b4345b90e 100644
--- a/doc/modules/ROOT/pages/cljs/up_and_running.adoc
+++ b/doc/modules/ROOT/pages/cljs/up_and_running.adoc
@@ -55,6 +55,21 @@ or in `deps.edn`:
    "[cider.nrepl/cider-middleware,cider.piggieback/wrap-cljs-repl]"]}}}
 ----
 
+or in `build.gradle`:
+
+[source, groovy]
+----
+dependencies {
+  devImplementation 'nrepl:nrepl:0.9.0'
+  devImplementation 'cider:cider-nrepl:0.28.5'
+  devImplementation 'cider:cider-piggieback:0.5.3'
+}
+
+tasks.named('clojureRepl') {
+  middleware = ['cider.nrepl/cider-middleware', 
'cider.piggieback/wrap-cljs-repl']
+}
+----
+
 == Starting a ClojureScript REPL
 
 Open a ClojureScript file in your project and type kbd:[M-x]
diff --git a/test/cider-tests.el b/test/cider-tests.el
index f661741897..edb4739ba8 100644
--- a/test/cider-tests.el
+++ b/test/cider-tests.el
@@ -105,6 +105,34 @@
       (expect (cider-project-type) :to-equal cider-jack-in-default))))
 
 ;;; cider-jack-in tests
+(describe "cider--gradle-dependency-notation"
+  (it "returns a GAV when given a two-element list"
+    (expect (cider--gradle-dependency-notation '("cider/piggieback" "0.5.3"))
+            :to-equal "cider:piggieback:0.5.3")))
+
+(describe "cider--gradle-jack-in-property"
+  (it "returns an empty string if no dependencies passed"
+    (expect (cider--gradle-jack-in-property nil)
+            :to-equal ""))
+  (it "returns a Gradle property if one dependency passed"
+    (expect (cider--gradle-jack-in-property '(("abc/def" "1.2.3")))
+            :to-equal (shell-quote-argument 
"-Pdev.clojurephant.jack-in.nrepl=abc:def:1.2.3")))
+  (it "returns a comma-separated Gradle property if multiple dependencies 
passed"
+    (expect (cider--gradle-jack-in-property '(("abc/def" "1.2.3")
+                                              ("ghi/jkl" "4.5.6")
+                                              ("mno/pqr" "7.8.9")))
+            :to-equal (shell-quote-argument 
"-Pdev.clojurephant.jack-in.nrepl=abc:def:1.2.3,ghi:jkl:4.5.6,mno:pqr:7.8.9"))))
+
+(describe "cider--gradle-middleware-params"
+  (it "returns an empty string if no middlewares are passed"
+    (expect (cider--gradle-middleware-params nil)
+            :to-equal ""))
+  (it "returns a single middleware param if one passed"
+    (expect (cider--gradle-middleware-params '("my-ns/my-middleware"))
+            :to-equal  "--middleware\\=my-ns/my-middleware"))
+  (it "returrns multiple middleware params, space-separated, if multiple 
passed"
+    (expect (cider--gradle-middleware-params '("my-ns/my-middleware" 
"other-ns/other-middleware"))
+            :to-equal "--middleware\\=my-ns/my-middleware 
--middleware\\=other-ns/other-middleware")))
 
 (describe "cider-inject-jack-in-dependencies"
   :var (cider-jack-in-dependencies cider-jack-in-nrepl-middlewares 
cider-jack-in-lein-plugins cider-jack-in-dependencies-exclusions)
@@ -112,7 +140,7 @@
   (describe "when there is a single dependency"
     (before-each
       (setq-local cider-injected-nrepl-version "0.9.0")
-      (setq-local cider-injected-middleware-version "0.28.4")
+      (setq-local cider-injected-middleware-version "0.28.5")
       (setq-local cider-jack-in-nrepl-middlewares 
'("cider.nrepl/cider-middleware"))
       (setq-local cider-jack-in-dependencies-exclusions '())
       (setq-local cider-enrich-classpath t))
@@ -122,7 +150,7 @@
               :to-equal (concat "update-in :dependencies conj "
                                 (shell-quote-argument "[nrepl/nrepl 
\"0.9.0\"]")
                                 " -- update-in :plugins conj "
-                                (shell-quote-argument "[cider/cider-nrepl 
\"0.28.4\"]")
+                                (shell-quote-argument "[cider/cider-nrepl 
\"0.28.5\"]")
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument 
"[mx.cider/enrich-classpath \"1.9.0\"]")
                                 " -- update-in :middleware conj 
cider.enrich-classpath/middleware"
@@ -135,7 +163,7 @@
                          "update-in :dependencies conj "
                          (shell-quote-argument "[nrepl/nrepl \"0.9.0\" 
:exclusions [org.clojure/clojure]]")
                          " -- update-in :plugins conj "
-                         (shell-quote-argument "[cider/cider-nrepl 
\"0.28.4\"]")
+                         (shell-quote-argument "[cider/cider-nrepl 
\"0.28.5\"]")
                          " -- update-in :plugins conj "
                          (shell-quote-argument "[mx.cider/enrich-classpath 
\"1.9.0\"]")
                          " -- update-in :middleware conj 
cider.enrich-classpath/middleware"
@@ -147,7 +175,7 @@
               :to-equal (concat "update-in :dependencies conj "
                                 (shell-quote-argument "[nrepl/nrepl \"0.9.0\" 
:exclusions [org.clojure/clojure foo.bar/baz]]")
                                 " -- update-in :plugins conj "
-                                (shell-quote-argument "[cider/cider-nrepl 
\"0.28.4\"]")
+                                (shell-quote-argument "[cider/cider-nrepl 
\"0.28.5\"]")
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument 
"[mx.cider/enrich-classpath \"1.9.0\"]")
                                 " -- update-in :middleware conj 
cider.enrich-classpath/middleware"
@@ -160,15 +188,18 @@
                          " -d "
                          (shell-quote-argument "nrepl/nrepl:0.9.0")
                          " -d "
-                         (shell-quote-argument "cider/cider-nrepl:0.28.4")
+                         (shell-quote-argument "cider/cider-nrepl:0.28.5")
                          " cider.tasks/add-middleware"
                          " -m "
                          (shell-quote-argument "cider.nrepl/cider-middleware")
                          " repl -s wait")))
 
     (it "can inject dependencies in a gradle project"
-      (expect (cider-inject-jack-in-dependencies "" "--no-daemon clojureRepl" 
'gradle)
-              :to-equal "--no-daemon clojureRepl")))
+      (expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 
'gradle)
+              :to-equal (concat "--no-daemon "
+                                (shell-quote-argument 
"-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.28.5")
+                                " :clojureRepl "
+                                (shell-quote-argument 
"--middleware=cider.nrepl/cider-middleware")))))
 
   (describe "when there are multiple dependencies"
     (before-each
@@ -183,7 +214,7 @@
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument "[refactor-nrepl 
\"2.0.0\"]")
                                 " -- update-in :plugins conj "
-                                (shell-quote-argument "[cider/cider-nrepl 
\"0.28.4\"]")
+                                (shell-quote-argument "[cider/cider-nrepl 
\"0.28.5\"]")
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument 
"[mx.cider/enrich-classpath \"1.9.0\"]")
                                 " -- update-in :middleware conj 
cider.enrich-classpath/middleware"
@@ -196,7 +227,7 @@
                                 " -d "
                                 (shell-quote-argument "nrepl/nrepl:0.9.0")
                                 " -d "
-                                (shell-quote-argument 
"cider/cider-nrepl:0.28.4")
+                                (shell-quote-argument 
"cider/cider-nrepl:0.28.5")
                                 " -d "
                                 (shell-quote-argument "refactor-nrepl:2.0.0")
                                 " cider.tasks/add-middleware"
@@ -218,7 +249,7 @@
               :to-equal (concat "-o -U update-in :dependencies conj "
                                 (shell-quote-argument "[nrepl/nrepl 
\"0.9.0\"]")
                                 " -- update-in :plugins conj "
-                                (shell-quote-argument "[cider/cider-nrepl 
\"0.28.4\"]")
+                                (shell-quote-argument "[cider/cider-nrepl 
\"0.28.5\"]")
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument 
"[mx.cider/enrich-classpath \"1.9.0\"]")
                                 " -- update-in :middleware conj 
cider.enrich-classpath/middleware"
@@ -229,14 +260,17 @@
                                 " -d "
                                 (shell-quote-argument "nrepl/nrepl:0.9.0")
                                 " -d "
-                                (shell-quote-argument 
"cider/cider-nrepl:0.28.4")
+                                (shell-quote-argument 
"cider/cider-nrepl:0.28.5")
                                 " cider.tasks/add-middleware"
                                 " -m "
                                 (shell-quote-argument 
"cider.nrepl/cider-middleware")
                                 " repl -s wait")))
     (it "can concat in a gradle project"
-      (expect (cider-inject-jack-in-dependencies "-m" "--no-daemon 
clojureRepl" 'gradle)
-              :to-equal "-m --no-daemon clojureRepl")))
+      (expect (cider-inject-jack-in-dependencies "--no-daemon" ":clojureRepl" 
'gradle)
+              :to-equal (concat "--no-daemon "
+                                (shell-quote-argument 
"-Pdev.clojurephant.jack-in.nrepl=nrepl:nrepl:0.9.0,cider:cider-nrepl:0.28.5")
+                                " :clojureRepl "
+                                (shell-quote-argument 
"--middleware=cider.nrepl/cider-middleware")))))
 
   (describe "when there are predicates"
     :var (plugins-predicate middlewares-predicate)
@@ -249,14 +283,14 @@
       (setq-local cider-jack-in-nrepl-middlewares 
'(("refactor-nrepl.middleware/wrap-refactor" :predicate middlewares-predicate) 
"cider.nrepl/cider-middleware" ("another/middleware"))))
     (it "includes plugins whose predicates return true"
       (expect (cider-jack-in-normalized-lein-plugins)
-              :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" 
"0.28.4"))))
+              :to-equal '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" 
"0.28.5"))))
     (it "includes middlewares whose predicates return true"
       (expect (cider-jack-in-normalized-nrepl-middlewares)
               :to-equal '("refactor-nrepl.middleware/wrap-refactor" 
"cider.nrepl/cider-middleware" "another/middleware")))
     (it "ignores plugins whose predicates return false"
       (spy-on 'plugins-predicate :and-return-value nil)
       (expect (cider-jack-in-normalized-lein-plugins)
-              :to-equal '(("cider/cider-nrepl" "0.28.4")))
+              :to-equal '(("cider/cider-nrepl" "0.28.5")))
       (spy-on 'middlewares-predicate :and-return-value nil)
       (expect (cider-jack-in-normalized-nrepl-middlewares)
               :to-equal '("cider.nrepl/cider-middleware" 
"another/middleware")))
@@ -285,7 +319,7 @@
               :and-return-value '("refactor-nrepl.middleware/wrap-refactor" 
"cider.nrepl/cider-middleware"))
       (spy-on 'cider-jack-in-normalized-lein-plugins
               :and-return-value '(("refactor-nrepl" "2.0.0")
-                                  ("cider/cider-nrepl" "0.28.4")
+                                  ("cider/cider-nrepl" "0.28.5")
                                   ("mx.cider/enrich-classpath" "1.9.0")))
       (setq-local cider-jack-in-dependencies-exclusions '())
       (setq-local cider-enrich-classpath t))
@@ -296,7 +330,7 @@
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument "[refactor-nrepl 
\"2.0.0\"]")
                                 " -- update-in :plugins conj "
-                                (shell-quote-argument "[cider/cider-nrepl 
\"0.28.4\"]")
+                                (shell-quote-argument "[cider/cider-nrepl 
\"0.28.5\"]")
                                 " -- update-in :plugins conj "
                                 (shell-quote-argument 
"[mx.cider/enrich-classpath \"1.9.0\"]")
                                 " -- update-in :middleware conj 
cider.enrich-classpath/middleware"
@@ -314,7 +348,7 @@
                                 " -d "
                                 (shell-quote-argument "nrepl/nrepl:0.9.0")
                                 " -d "
-                                (shell-quote-argument 
"cider/cider-nrepl:0.28.4")
+                                (shell-quote-argument 
"cider/cider-nrepl:0.28.5")
                                 " -d "
                                 (shell-quote-argument "refactor-nrepl:2.0.0")
                                 " cider.tasks/add-middleware"
@@ -401,7 +435,7 @@
       (setq-local cider-jack-in-dependencies nil)
       (setq-local cider-jack-in-nrepl-middlewares 
'("cider.nrepl/cider-middleware"))
       (let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl 
{:mvn/version \"0.9.0\"} "
-                                     "cider/cider-nrepl {:mvn/version 
\"0.28.4\"}} "
+                                     "cider/cider-nrepl {:mvn/version 
\"0.28.5\"}} "
                                      ":aliases {:cider/nrepl {:main-opts 
[\"-m\" \"nrepl.cmdline\" \"--middleware\""
                                      " \"[cider.nrepl/cider-middleware]\"]}}}' 
-M:cider/nrepl")
                                    "")))
@@ -413,10 +447,10 @@
         (spy-on 'cider-jack-in-resolve-command :and-return-value "clojure")
         (expect (plist-get (cider--update-jack-in-cmd nil) :jack-in-cmd)
                 :to-equal expected)))
-    
+
     (it "allows specifying custom aliases with `cider-clojure-cli-aliases`"
       (let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl 
{:mvn/version \"0.9.0\"} "
-                                     "cider/cider-nrepl {:mvn/version 
\"0.28.4\"}} "
+                                     "cider/cider-nrepl {:mvn/version 
\"0.28.5\"}} "
                                      ":aliases {:cider/nrepl {:main-opts 
[\"-m\" \"nrepl.cmdline\" \"--middleware\""
                                      " \"[cider.nrepl/cider-middleware]\"]}}}' 
-M:dev:test:cider/nrepl")
                                    "")))
@@ -430,7 +464,7 @@
         (expect (plist-get (cider--update-jack-in-cmd nil) :jack-in-cmd)
                 :to-equal expected)))
     (it "should remove duplicates, yielding the same result"
-        (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl 
{:mvn/version \"0.28.4\"} "
+        (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl 
{:mvn/version \"0.28.5\"} "
                                        "nrepl/nrepl {:mvn/version \"0.9.0\"}} "
                                        ":aliases {:cider/nrepl {:main-opts 
[\"-m\" \"nrepl.cmdline\" \"--middleware\""
                                        " 
\"[cider.nrepl/cider-middleware]\"]}}}' -M:dev:test:cider/nrepl")
@@ -439,7 +473,7 @@
                                                                     
("nrepl/nrepl" "0.9.0")))
                   :to-equal expected)))
     (it "handles aliases correctly"
-      (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl 
{:mvn/version \"0.28.4\"} "
+      (let ((expected (string-join '("-Sdeps '{:deps {cider/cider-nrepl 
{:mvn/version \"0.28.5\"} "
                                      "nrepl/nrepl {:mvn/version \"0.9.0\"}} "
                                      ":aliases {:cider/nrepl {:main-opts 
[\"-m\" \"nrepl.cmdline\" \"--middleware\""
                                      " \"[cider.nrepl/cider-middleware]\"]}}}' 
-M:test:cider/nrepl")
@@ -462,7 +496,7 @@
             (expect (cider-clojure-cli-jack-in-dependencies nil nil deps)
                     :to-equal expected)))))
     (it "allows for global options"
-      (let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps 
'{:deps {cider/cider-nrepl {:mvn/version \"0.28.4\"} "
+      (let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps 
'{:deps {cider/cider-nrepl {:mvn/version \"0.28.5\"} "
                                      "nrepl/nrepl {:mvn/version \"0.9.0\"}} "
                                      ":aliases {:cider/nrepl {:main-opts 
[\"-m\" \"nrepl.cmdline\" \"--middleware\""
                                      " \"[cider.nrepl/cider-middleware]\"]}}}' 
-M:test:cider/nrepl")



reply via email to

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