Drop support for tools.nrepl

bbatsov · bbatsov · commit 5099ce03c17a · 2019-01-02T10:38:31.000+02:00
diff --git a/README.md b/README.md
@@ -92,9 +92,10 @@ hackers to make this a reality.
 
 ### Prerequisites
 
-`cider-nrepl` supports only Clojure(Script) 1.7+ and Java 7+.
+`cider-nrepl` supports only Clojure(Script) 1.8+ and Java 8+.
 
-Leiningen users will need to have version 2.5.2 or newer installed.
+Leiningen users will need to have version 2.8.3 or newer installed.
+Boot users will need to have version 2.8.2 or newer installed.
 
 ### Via Leiningen
 
diff --git a/project.clj b/project.clj
@@ -83,7 +83,7 @@
                                                      cider.nrepl/wrap-undef
                                                      cider.nrepl/wrap-version]}
                    :dependencies [;; For developing the Leiningen plugin.
-                                  [leiningen-core "2.8.1"]
+                                  [leiningen-core "2.8.3"]
                                   ;; For the boot tasks namespace
                                   [boot/base "2.8.2"]
                                   [boot/core "2.8.2"]]}
@@ -120,4 +120,4 @@
                                          if-class [[:block 1]]}}}
 
              :eastwood {:plugins [[jonase/eastwood "0.3.4"]]
-                        :eastwood {:config-files ["eastwood.clj"] :exclude-namespaces [cider-nrepl.plugin cider.tasks cider.nrepl.test-session] :exclude-linters [:implicit-dependencies]}}})
+                        :eastwood {:config-files ["eastwood.clj"] :exclude-namespaces [cider-nrepl.plugin cider.tasks cider.nrepl.test-session]}}})
diff --git a/src/cider/nrepl.clj b/src/cider/nrepl.clj
@@ -3,22 +3,11 @@
    [cider.nrepl.version :as version]
    [cider.nrepl.middleware.util.cljs :as cljs]
    [cider.nrepl.middleware.pprint :as pprint]
-   [cider.nrepl.print-method]))
-
-;; 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.middleware.session :refer [session]]
-   '[clojure.tools.nrepl.middleware.pr-values :refer [pr-values]]
-   '[clojure.tools.nrepl.server :as nrepl-server])
-  (require
-   '[nrepl.middleware :refer [set-descriptor!]]
-   '[nrepl.middleware.session :refer [session]]
-   '[nrepl.middleware.pr-values :refer [pr-values]]
-   '[nrepl.server :as nrepl-server]))
+   [cider.nrepl.print-method]
+   [nrepl.middleware :refer [set-descriptor!]]
+   [nrepl.middleware.session :refer [session]]
+   [nrepl.middleware.pr-values :refer [pr-values]]
+   [nrepl.server :as nrepl-server]))
 
 (def delayed-handlers
   "Map of `delay`s holding deferred middleware handlers."
diff --git a/src/cider/nrepl/middleware/content_type.clj b/src/cider/nrepl/middleware/content_type.clj
@@ -49,14 +49,8 @@
    [java.io ByteArrayOutputStream File OutputStream]
    [java.net URI URL]
    java.nio.file.Path
-   javax.imageio.ImageIO))
-
-;; 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)
-  (import 'clojure.tools.nrepl.transport.Transport)
-  (import 'nrepl.transport.Transport))
+   javax.imageio.ImageIO
+   nrepl.transport.Transport))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
diff --git a/src/cider/nrepl/middleware/debug.clj b/src/cider/nrepl/middleware/debug.clj
@@ -7,28 +7,17 @@
    [cider.nrepl.middleware.util.cljs :as cljs]
    [cider.nrepl.middleware.util.instrument :as ins]
    [cider.nrepl.middleware.util.nrepl :refer [notify-client]]
+   [nrepl.middleware.interruptible-eval :refer [*msg*]]
+   [nrepl.middleware.session :as session]
+   [nrepl.misc :refer [response-for]]
+   [nrepl.transport :as transport]
    [orchard.info :as info]
    [orchard.inspect :as inspect]
    [orchard.meta :as m]
    [orchard.misc :as misc])
   (:import
    [clojure.lang Compiler$LocalBinding]))
 
-;; 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.interruptible-eval :refer [*msg*]]
-   '[clojure.tools.nrepl.middleware.session :as session]
-   '[clojure.tools.nrepl.misc :refer [response-for]]
-   '[clojure.tools.nrepl.transport :as transport])
-  (require
-   '[nrepl.middleware.interruptible-eval :refer [*msg*]]
-   '[nrepl.middleware.session :as session]
-   '[nrepl.misc :refer [response-for]]
-   '[nrepl.transport :as transport]))
-
 ;;;; # The Debugger
 ;;;
 ;;; The debugger is divided into two parts, instrument.clj and
diff --git a/src/cider/nrepl/middleware/inspect.clj b/src/cider/nrepl/middleware/inspect.clj
@@ -3,22 +3,11 @@
    [cider.nrepl.middleware.util.cljs :as cljs]
    [cider.nrepl.middleware.util.error-handling :refer [base-error-response
                                                        with-safe-transport]]
-   [orchard.inspect :as inspect]))
-
-;; 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)
-  (do
-    (require
-     '[clojure.tools.nrepl.misc :refer [response-for]]
-     '[clojure.tools.nrepl.transport :as transport])
-    (import 'clojure.tools.nrepl.transport.Transport))
-  (do
-    (require
-     '[nrepl.misc :refer [response-for]]
-     '[nrepl.transport :as transport])
-    (import 'nrepl.transport.Transport)))
+   [nrepl.misc :refer [response-for]]
+   [nrepl.transport :as transport]
+   [orchard.inspect :as inspect])
+  (:import
+   nrepl.transport.Transport))
 
 (def ^:dynamic *inspector* (inspect/fresh))
 
diff --git a/src/cider/nrepl/middleware/out.clj b/src/cider/nrepl/middleware/out.clj
@@ -10,17 +10,12 @@
   guarantee that the channel that sent the clone message will properly
   handle output replies."
   (:require
-   [cider.nrepl.middleware.util.error-handling :refer [with-safe-transport]])
+   [cider.nrepl.middleware.util.error-handling :refer [with-safe-transport]]
+   [nrepl.middleware.interruptible-eval :as ieval])
   (:import
    [java.io PrintWriter Writer PrintStream OutputStream]
    [java.util TimerTask Timer]))
 
-(if (find-ns 'clojure.tools.nrepl)
-  (require
-   '[clojure.tools.nrepl.middleware.interruptible-eval :as ieval])
-  (require
-   '[nrepl.middleware.interruptible-eval :as ieval]))
-
 (declare unsubscribe-session)
 
 (def original-output
diff --git a/src/cider/nrepl/middleware/pprint.clj b/src/cider/nrepl/middleware/pprint.clj
@@ -2,25 +2,14 @@
   (:require
    [cider.nrepl.middleware.util.cljs :as cljs]
    [clojure.pprint :refer [pprint *print-right-margin*]]
-   [orchard.misc :as u]))
-
-(if (find-ns 'clojure.tools.nrepl)
-  (do
-    (require
-     '[clojure.tools.nrepl.middleware.interruptible-eval :refer [*msg*]]
-     '[clojure.tools.nrepl.middleware.pr-values :refer [pr-values]]
-     '[clojure.tools.nrepl.middleware.session :as session]
-     '[clojure.tools.nrepl.misc :refer [response-for]]
-     '[clojure.tools.nrepl.transport :as transport])
-    (import 'clojure.tools.nrepl.transport.Transport))
-  (do
-    (require
-     '[nrepl.middleware.interruptible-eval :refer [*msg*]]
-     '[nrepl.middleware.pr-values :refer [pr-values]]
-     '[nrepl.middleware.session :as session]
-     '[nrepl.misc :refer [response-for]]
-     '[nrepl.transport :as transport])
-    (import 'nrepl.transport.Transport)))
+   [nrepl.middleware.interruptible-eval :refer [*msg*]]
+   [nrepl.middleware.pr-values :refer [pr-values]]
+   [nrepl.middleware.session :as session]
+   [nrepl.misc :refer [response-for]]
+   [nrepl.transport :as transport]
+   [orchard.misc :as u])
+  (:import
+   nrepl.transport.Transport))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
diff --git a/src/cider/nrepl/middleware/profile.clj b/src/cider/nrepl/middleware/profile.clj
@@ -15,16 +15,10 @@
   maintained anymore."
   {:author "Edwin Watkeys"}
   (:require
+   [nrepl.misc :refer [response-for]]
+   [nrepl.transport :as t]
    [profile.core :as p]))
 
-(if (find-ns 'clojure.tools.nrepl)
-  (require
-   '[clojure.tools.nrepl.misc :refer [response-for]]
-   '[clojure.tools.nrepl.transport :as t])
-  (require
-   '[nrepl.misc :refer [response-for]]
-   '[nrepl.transport :as t]))
-
 (defn send-exception
   [e msg transport]
   (t/send transport (response-for msg :status :done :value "exception")))
diff --git a/src/cider/nrepl/middleware/refresh.clj b/src/cider/nrepl/middleware/refresh.clj
@@ -11,18 +11,11 @@
    [clojure.tools.namespace.find :as find]
    [clojure.tools.namespace.reload :as reload]
    [clojure.tools.namespace.track :as track]
+   [nrepl.middleware.interruptible-eval :refer [*msg*]]
+   [nrepl.misc :refer [response-for]]
+   [nrepl.transport :as transport]
    [orchard.misc :as u]))
 
-(if (find-ns 'clojure.tools.nrepl)
-  (require
-   '[clojure.tools.nrepl.middleware.interruptible-eval :refer [*msg*]]
-   '[clojure.tools.nrepl.misc :refer [response-for]]
-   '[clojure.tools.nrepl.transport :as transport])
-  (require
-   '[nrepl.middleware.interruptible-eval :refer [*msg*]]
-   '[nrepl.misc :refer [response-for]]
-   '[nrepl.transport :as transport]))
-
 (defonce ^:private refresh-tracker (agent (track/tracker)))
 
 (defn- user-refresh-dirs
diff --git a/src/cider/nrepl/middleware/slurp.clj b/src/cider/nrepl/middleware/slurp.clj
@@ -7,20 +7,14 @@
   (:require
    [clojure.edn :as edn]
    [clojure.java.io :as io]
-   [clojure.string :as str])
+   [clojure.string :as str]
+   [nrepl.misc :refer [response-for]]
+   [nrepl.transport :as transport])
   (:import
    [java.net MalformedURLException URL]
    java.io.ByteArrayOutputStream
    [java.nio.file Files Path Paths]))
 
-(if (find-ns 'clojure.tools.nrepl)
-  (require
-   '[clojure.tools.nrepl.misc :refer [response-for]]
-   '[clojure.tools.nrepl.transport :as transport])
-  (require
-   '[nrepl.misc :refer [response-for]]
-   '[nrepl.transport :as transport]))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defmacro if-class
diff --git a/src/cider/nrepl/middleware/stacktrace.clj b/src/cider/nrepl/middleware/stacktrace.clj
@@ -5,23 +5,16 @@
    [clojure.repl :as repl]
    [clojure.set :as set]
    [clojure.string :as str]
+   [nrepl.middleware.session :refer [session]]
+   [nrepl.misc :refer [response-for]]
+   [nrepl.transport :as t]
    [orchard.info :as info]
    [orchard.java :as java]
    [orchard.misc :as u]
    [orchard.namespace :as namespace])
   (:import
    (clojure.lang Compiler$CompilerException)))
 
-(if (find-ns 'clojure.tools.nrepl)
-  (require
-   '[clojure.tools.nrepl.middleware.session :refer [session]]
-   '[clojure.tools.nrepl.misc :refer [response-for]]
-   '[clojure.tools.nrepl.transport :as t])
-  (require
-   '[nrepl.middleware.session :refer [session]]
-   '[nrepl.misc :refer [response-for]]
-   '[nrepl.transport :as t]))
-
 ;;; ## Stacktraces
 
 ;; Java stacktraces don't expose column number.
diff --git a/src/cider/nrepl/middleware/test.clj b/src/cider/nrepl/middleware/test.clj
@@ -2,26 +2,18 @@
   "Test execution, reporting, and inspection"
   {:author "Jeff Valk"}
   (:require
+   [cider.nrepl.middleware.stacktrace :as st]
    [cider.nrepl.middleware.test.extensions :as extensions]
    [cider.nrepl.middleware.util.coerce :as util.coerce]
    [clojure.pprint :as pp]
    [clojure.test :as test]
    [clojure.walk :as walk]
+   [nrepl.middleware.interruptible-eval :as ie]
+   [nrepl.middleware.pr-values :refer [pr-values]]
+   [nrepl.misc :refer [response-for]]
+   [nrepl.transport :as t]
    [orchard.misc :as u]
-   [orchard.query :as query]
-   [cider.nrepl.middleware.stacktrace :as st]))
-
-(if (find-ns 'clojure.tools.nrepl)
-  (require
-   '[clojure.tools.nrepl.middleware.interruptible-eval :as ie]
-   '[clojure.tools.nrepl.middleware.pr-values :refer [pr-values]]
-   '[clojure.tools.nrepl.misc :refer [response-for]]
-   '[clojure.tools.nrepl.transport :as t])
-  (require
-   '[nrepl.middleware.interruptible-eval :as ie]
-   '[nrepl.middleware.pr-values :refer [pr-values]]
-   '[nrepl.misc :refer [response-for]]
-   '[nrepl.transport :as t]))
+   [orchard.query :as query]))
 
 ;;; ## Overview
 ;;
diff --git a/src/cider/nrepl/middleware/track_state.clj b/src/cider/nrepl/middleware/track_state.clj
@@ -5,23 +5,14 @@
    [cider.nrepl.middleware.util.cljs :as cljs]
    [cider.nrepl.middleware.util.meta :as um]
    [cljs-tooling.util.analysis :as cljs-ana]
+   [nrepl.misc :refer [response-for]]
+   [nrepl.transport :as transport]
    [orchard.misc :as u]
    [orchard.namespace :as namespace])
   (:import
    (clojure.lang Namespace MultiFn)
-   java.net.SocketException))
-
-(if (find-ns 'clojure.tools.nrepl)
-  (do
-    (require
-     '[clojure.tools.nrepl.misc :refer [response-for]]
-     '[clojure.tools.nrepl.transport :as transport])
-    (import 'clojure.tools.nrepl.transport.Transport))
-  (do
-    (require
-     '[nrepl.misc :refer [response-for]]
-     '[nrepl.transport :as transport])
-    (import 'nrepl.transport.Transport)))
+   java.net.SocketException
+   nrepl.transport.Transport))
 
 (def clojure-core (try (find-ns 'clojure.core)
                        (catch Exception e nil)))
diff --git a/src/cider/nrepl/middleware/util/error_handling.clj b/src/cider/nrepl/middleware/util/error_handling.clj
@@ -4,19 +4,13 @@
   (:refer-clojure :exclude [error-handler])
   (:require
    [clojure.set :as set]
-   [clojure.walk :as walk])
+   [clojure.walk :as walk]
+   [nrepl.misc :refer [response-for]]
+   [nrepl.transport :as transport])
   (:import
    java.io.InputStream
    clojure.lang.RT))
 
-(if (find-ns 'clojure.tools.nrepl)
-  (require
-   '[clojure.tools.nrepl.misc :refer [response-for]]
-   '[clojure.tools.nrepl.transport :as transport])
-  (require
-   '[nrepl.misc :refer [response-for]]
-   '[nrepl.transport :as transport]))
-
 (def ^:private print-cause-trace
   (delay
    (do
diff --git a/src/cider/nrepl/middleware/util/nrepl.clj b/src/cider/nrepl/middleware/util/nrepl.clj
@@ -1,15 +1,9 @@
 (ns cider.nrepl.middleware.util.nrepl
-  "Common utilities for interaction with the client.")
-
-(if (find-ns 'clojure.tools.nrepl)
-  (require
-   '[clojure.tools.nrepl.middleware.interruptible-eval :refer [*msg*]]
-   '[clojure.tools.nrepl.misc :refer [response-for]]
-   '[clojure.tools.nrepl.transport :as transport])
-  (require
-   '[nrepl.middleware.interruptible-eval :refer [*msg*]]
-   '[nrepl.misc :refer [response-for]]
-   '[nrepl.transport :as transport]))
+  "Common utilities for interaction with the client."
+  (:require
+   [nrepl.middleware.interruptible-eval :refer [*msg*]]
+   [nrepl.misc :refer [response-for]]
+   [nrepl.transport :as transport]))
 
 (defn notify-client
   "Send user level notification to client as a response to request `msg`.
diff --git a/src/cider/nrepl/middleware/version.clj b/src/cider/nrepl/middleware/version.clj
diff --git a/src/cider_nrepl/plugin.clj b/src/cider_nrepl/plugin.clj
