[Fix #232] Add compatibility with nREPL 0.4

bbatsov · bbatsov · commit 65da8bfbb04f · 2018-08-05T09:44:01.000+03:00
Support with tools.nrepl is kept for now with the assumption
that tools.nrepl namespaces would be loaded automatically by
`lein repl` or `boot repl`.

Support for tools.nrepl will likely be removed after a couple of
releases (once mainstream Lein and Boot switch to nREPL 0.4).

This also updates the archaic piggieback dep the project was using.
diff --git a/README.md b/README.md
@@ -43,12 +43,17 @@ Add the following in `~/.boot/profile.boot`:
 
 ### Passing messages to and from refactor-nrepl
 
-We've already called this a middleware, but we haven't really talked about what that means.  refactor-nrepl is middleware for a REPL.  Specifically it's middleware for a networked REPL, which is managed by [clojure.tools.nrepl](https://github.com/clojure/tools.nrepl).  refactor-nrepl uses the running REPL to to gain insight about your project, in order to offer various refactorings.
+We've already called this a middleware, but we haven't really talked
+about what that means.  refactor-nrepl is middleware for a REPL.
+Specifically it's middleware for a networked REPL, which is managed by
+[nREPL](https://github.com/nrepl/nrepl).
+refactor-nrepl uses the running REPL to to gain insight about your
+project, in order to offer various refactorings.
 
 Most likely you're already in an environment with a nREPL client available, so you don't have to worry about anything except sending an receiving messages:
 
 ```cljs
-=> (require '[clojure.tools.nrepl :as repl])
+=> (require '[nrepl.core :as repl])
 nil
 => (with-open [conn (repl/connect :port 59258)]
      (-> (repl/client conn 1000)    ; message receive timeout required
diff --git a/project.clj b/project.clj
@@ -3,7 +3,7 @@
   :url "http://github.com/clojure-emacs/refactor-nrepl"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/tools.nrepl "0.2.13"]
+  :dependencies [[nrepl "0.4.4"]
                  ^:source-dep [http-kit "2.2.0"]
                  ^:source-dep [cheshire "5.8.0"]
                  ^:source-dep [org.clojure/tools.analyzer.jvm "0.7.1"]
@@ -27,10 +27,10 @@
              :dev {:plugins [[jonase/eastwood "0.2.0"]]
                    :global-vars {*warn-on-reflection* true}
                    :dependencies [[org.clojure/clojurescript "1.9.89"]
-                                  [com.cemerick/piggieback "0.2.2"]
+                                  [cider/piggieback "0.3.8"]
                                   [leiningen-core "2.7.1"]
                                   [commons-io/commons-io "2.6"]]
-                   :repl-options {:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}
+                   :repl-options {:nrepl-middleware [cider.piggieback/wrap-cljs-repl]}
                    :java-source-paths ["test/java"]
                    :resource-paths ["test/resources"
                                     "test/resources/testproject/src"]
diff --git a/src/refactor_nrepl/middleware.clj b/src/refactor_nrepl/middleware.clj
@@ -1,15 +1,25 @@
 (ns refactor-nrepl.middleware
   (:require [cider.nrepl.middleware.util.cljs :as cljs]
             [clojure.stacktrace :refer [print-cause-trace]]
-            [clojure.tools.nrepl.middleware :refer [set-descriptor!]]
-            [clojure.tools.nrepl.misc :refer [response-for]]
-            [clojure.tools.nrepl.transport :as transport]
             [refactor-nrepl.config :as config]
             [refactor-nrepl.core :as core]
             [refactor-nrepl.ns.libspecs :refer [namespace-aliases]]
             [refactor-nrepl.stubs-for-interface :refer [stubs-for-interface]]
             [clojure.walk :as walk]))
 
+;; Compatibility with the legacy tools.nrepl and the new nREPL 0.4.x.
+;; The assumption is that if someone is using old lein repl or boot repl
+;; they'll end up using the tools.nrepl, otherwise the modern one.
+(if (find-ns 'clojure.tools.nrepl)
+  (require
+   '[clojure.tools.nrepl.middleware :refer [set-descriptor!]]
+   '[clojure.tools.nrepl.misc :refer [response-for]]
+   '[clojure.tools.nrepl.transport :as transport])
+  (require
+   '[nrepl.middleware :refer [set-descriptor!]]
+   '[nrepl.misc :refer [response-for]]
+   '[nrepl.transport :as transport]))
+
 (defn- require-and-resolve [sym]
   (require (symbol (namespace sym)))
   (resolve sym))
diff --git a/test/refactor_nrepl/client.clj b/test/refactor_nrepl/client.clj
@@ -2,7 +2,7 @@
   (:require [clojure
              [edn :as edn]
              [string :as str]]
-            [clojure.tools.nrepl :as nrepl])
+            [nrepl.core :as nrepl])
   (:import java.io.File))
 
 (def ^:private nrepl-port
diff --git a/test/refactor_nrepl/integration_tests.clj b/test/refactor_nrepl/integration_tests.clj
@@ -1,7 +1,7 @@
 (ns refactor-nrepl.integration-tests
   (:require [clojure.java.io :as io]
             [clojure.test :refer :all]
-            [clojure.tools.nrepl.server :as nrserver]
+            [nrepl.server :as nrserver]
             [refactor-nrepl middleware
              [client :refer :all]
              [core :as core]]
diff --git a/test/refactor_nrepl/ns/clean_ns_test.clj b/test/refactor_nrepl/ns/clean_ns_test.clj
@@ -139,7 +139,7 @@
                                [string :as str]]
                               [clojure.data.json :as json]
                               [clojure.java.io :as io]
-                              [clojure.tools.nrepl
+                              [nrepl
                                [middleware :refer [set-descriptor!]]
                                [misc :refer [response-for]]
                                [transport :as transport]]
diff --git a/test/refactor_nrepl/ns/resolve_missing_caching_test.clj b/test/refactor_nrepl/ns/resolve_missing_caching_test.clj
@@ -1,7 +1,7 @@
 (ns refactor-nrepl.ns.resolve-missing-caching-test
   (:require [clojure
              [edn :as edn]]
-            [clojure.tools.nrepl :as nrepl]
+            [nrepl.core :as nrepl]
             [refactor-nrepl.ns.resolve-missing-test :refer [session-fixture]]
             [clojure.test :refer [deftest testing is use-fixtures]]
             [clojure.string :as str]))
diff --git a/test/refactor_nrepl/ns/resolve_missing_test.clj b/test/refactor_nrepl/ns/resolve_missing_test.clj
@@ -1,10 +1,10 @@
 (ns refactor-nrepl.ns.resolve-missing-test
-  (:require [cemerick.piggieback :as piggieback]
+  (:require [cider.piggieback :as piggieback]
             [clojure
              [edn :as edn]
              [test :as t]]
-            [clojure.tools.nrepl :as nrepl]
-            [clojure.tools.nrepl.server :as server]
+            [nrepl.core :as nrepl]
+            [nrepl.server :as server]
             [refactor-nrepl.middleware :as middleware]))
 
 (def ^:dynamic *handler* (server/default-handler #'middleware/wrap-refactor))
@@ -35,7 +35,7 @@
                            #'piggieback/wrap-cljs-repl)]
        (message {:op :eval
                  :code (nrepl/code
-                        (require '[cemerick.piggieback :as piggieback])
+                        (require '[cider.piggieback :as piggieback])
                         (require '[cljs.repl.node :as node])
                         (piggieback/cljs-repl (node/repl-env)))})
        (f)
diff --git a/test/resources/artifacts_pprinted b/test/resources/artifacts_pprinted
@@ -4,7 +4,7 @@
              [string :as str]]
             [clojure.data.json :as json]
             [clojure.java.io :as io]
-            [clojure.tools.nrepl
+            [nrepl
              [middleware :refer [set-descriptor!]]
              [misc :refer [response-for]]
              [transport :as transport]]
