summaryrefslogtreecommitdiff
path: root/cider-connection.el
diff options
context:
space:
mode:
authorBozhidar Batsov <bozhidar@batsov.com>2018-08-06 09:07:34 +0300
committerBozhidar Batsov <bozhidar@batsov.com>2018-08-06 09:07:34 +0300
commit2ab2e3e1518d244236443cb82b130b81499050d6 (patch)
treefdac810a578c7a4fb7fb3fd88ef51c61be0a3072 /cider-connection.el
parent1c9f9e33a2c3995774953e43906148200b11507e (diff)
Stop releasing CIDER and cider-nrepl together
cider-nrepl now has its own release cycle and CIDER introduces `cider-required-middleware-version` to track it.
Diffstat (limited to 'cider-connection.el')
-rw-r--r--cider-connection.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/cider-connection.el b/cider-connection.el
index 9db28bb2..52f77855 100644
--- a/cider-connection.el
+++ b/cider-connection.el
@@ -195,6 +195,7 @@ FORMAT is a format string to compile with ARGS and display on the REPL."
"Can't determine Clojure's version. CIDER requires Clojure %s (or newer)."
cider-minimum-clojure-version)))
+(defvar cider-required-middleware-version)
(defun cider--check-middleware-compatibility ()
"CIDER frontend/backend compatibility check.
Retrieve the underlying connection's CIDER-nREPL version and checks if the
@@ -202,10 +203,10 @@ middleware used is compatible with CIDER. If not, will display a warning
message in the REPL area."
(let* ((version-dict (nrepl-aux-info "cider-version" (cider-current-repl)))
(middleware-version (nrepl-dict-get version-dict "version-string" "not installed")))
- (unless (equal cider-version middleware-version)
+ (unless (version<= cider-required-middleware-version middleware-version)
(cider-emit-manual-warning "troubleshooting/#cider-complains-of-the-cider-nrepl-version"
- "CIDER's version (%s) does not match cider-nrepl's version (%s). Things will break!"
- cider-version middleware-version))))
+ "CIDER %s requires cider-nrepl %s+, but you're currently using cider-nrepl %s. Things will break!"
+ cider-version cider-required-middleware-version middleware-version))))
(declare-function cider-interactive-eval-handler "cider-eval")
;; TODO: Use some null handler here