branch: elpa/cider
commit 160995b30e06988ba4c57ee2390b40735d1c7e29
Author: Bozhidar Batsov <bozhi...@batsov.dev>
Commit: Bozhidar Batsov <bozhi...@batsov.dev>
Drop support for Clojure 1.9
---
cider-eval.el | 20 ++------------------
cider.el | 6 +++---
doc/modules/ROOT/pages/about/compatibility.adoc | 9 ++++++++-
doc/modules/ROOT/pages/usage/misc_features.adoc | 2 --
test/cider-error-parsing-tests.el | 6 ------
5 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/cider-eval.el b/cider-eval.el
index b504e5b406..6eb9ab4fc2 100644
--- a/cider-eval.el
+++ b/cider-eval.el
@@ -562,11 +562,6 @@ It delegates the actual error content to the eval or op
handler."
(t (cider-default-err-eval-print-handler))))
-;; The format of the error messages emitted by Clojure's compiler changed in
-;; Clojure 1.10. That's why we're trying to match error messages to both the
-;; old and the new format, by utilizing a combination of two different regular
-;; expressions.
-
(defconst cider-clojure-1.10--location `((or "at ("
(sequence "at "
(minimal-match
(one-or-more anything)) ;; the fully-qualified name of the function that
triggered the error
@@ -596,15 +591,6 @@ It delegates the actual error content to the eval or op
handler."
(minimal-match (one-or-more
anything)))
cider-clojure-1.10--location))
-(defconst cider-clojure-1.9-error `(sequence
- (zero-or-more anything)
- ", compiling:("
- (group-n 2 (minimal-match (zero-or-more
anything)))
- ":"
- (group-n 3 (one-or-more digit))
- (optional ":" (group-n 4 (one-or-more
digit)))
- ")"))
-
(defconst cider-clojure-warning `(sequence
(minimal-match (zero-or-more anything))
(group-n 1 "warning")
@@ -619,8 +605,7 @@ It delegates the actual error content to the eval or op
handler."
;; which is a subset of these regexes.
(defconst cider-clojure-compilation-regexp
(eval
- `(rx bol (or ,cider-clojure-1.9-error
- ,cider-clojure-warning
+ `(rx bol (or ,cider-clojure-warning
,cider-clojure-1.10-error
,cider-clojure-unexpected-error))
t)
@@ -633,8 +618,7 @@ lol in this context, compiling:(/foo/core.clj:10:1)\"
(defconst cider-clojure-compilation-error-regexp
(eval
- `(rx bol (or ,cider-clojure-1.9-error
- ,cider-clojure-1.10-error
+ `(rx bol (or ,cider-clojure-1.10-error
,cider-clojure-unexpected-error))
t)
"Like `cider-clojure-compilation-regexp',
diff --git a/cider.el b/cider.el
index 8a7586803f..9629a17b40 100644
--- a/cider.el
+++ b/cider.el
@@ -141,7 +141,7 @@
(null (executable-find "clojure")))
"powershell"
"clojure")
- "The command used to execute clojure with tools.deps (requires Clojure 1.9+).
+ "The command used to execute clojure with tools.deps.
Don't use clj here, as it doesn't work when spawned from Emacs due to it
using rlwrap. If on Windows and no \"clojure\" executable is found we
default to \"powershell\"."
@@ -535,10 +535,10 @@ the artifact.")
(defconst cider-clojure-artifact-id "org.clojure/clojure"
"Artifact identifier for Clojure.")
-(defconst cider-minimum-clojure-version "1.8.0"
+(defconst cider-minimum-clojure-version "1.10.0"
"Minimum supported version of Clojure.")
-(defconst cider-latest-clojure-version "1.10.1"
+(defconst cider-latest-clojure-version "1.11.3"
"Latest supported version of Clojure.")
(defconst cider-required-middleware-version "0.47.0"
diff --git a/doc/modules/ROOT/pages/about/compatibility.adoc
b/doc/modules/ROOT/pages/about/compatibility.adoc
index d550a03b97..a0304a1a12 100644
--- a/doc/modules/ROOT/pages/about/compatibility.adoc
+++ b/doc/modules/ROOT/pages/about/compatibility.adoc
@@ -28,7 +28,7 @@ You can find example commands in
xref:troubleshooting.adoc#navigation-to-jdk-sou
== Clojure
-CIDER targets Clojure 1.9+. As Clojure doesn't have the concept of supported
releases
+CIDER targets Clojure 1.10+. As Clojure doesn't have the concept of supported
releases
we have to get a bit creative to determine the minimum version to target.
The minimum required Clojure version is currently derived using data
@@ -175,6 +175,13 @@ Below you can find the official compatibility matrix for
CIDER.
| 8
| 1.9
+| 1.14
+| 26.1
+| 1.0
+| 0.47
+| 8
+| 1.10
+
|===
TIP: You can also check the requirements of a particular CIDER version by
inspecting
diff --git a/doc/modules/ROOT/pages/usage/misc_features.adoc
b/doc/modules/ROOT/pages/usage/misc_features.adoc
index 4147587929..0378e88278 100644
--- a/doc/modules/ROOT/pages/usage/misc_features.adoc
+++ b/doc/modules/ROOT/pages/usage/misc_features.adoc
@@ -196,8 +196,6 @@ There are a bunch of useful keybindings that are defined in
browser buffers.
== Browsing the Clojure Spec Registry
-If you are using Clojure 1.9 or newer you can browse the Clojure spec registry.
-
If you already know which spec you're looking for, you can type
kbd:[M-x] `cider-browse-spec` and CIDER will prompt you for a
spec name and then drop you into the spec browser.
diff --git a/test/cider-error-parsing-tests.el
b/test/cider-error-parsing-tests.el
index e28f65e59e..7de0746c91 100644
--- a/test/cider-error-parsing-tests.el
+++ b/test/cider-error-parsing-tests.el
@@ -125,12 +125,6 @@
(match-string 1 clojure-compiler-warning))
:to-equal "warning")))
(dolist (regexp (list cider-clojure-compilation-regexp
cider-clojure-compilation-error-regexp))
- (it "Recognizes a clojure-1.9 error message"
- (let ((clojure-1.9-compiler-error "CompilerException
java.lang.RuntimeException: Unable to resolve symbol: lol in this context,
compiling:(/tmp/foo/src/foo/core.clj:10:1)"))
- (expect clojure-1.9-compiler-error :to-match regexp)
- (expect (progn (string-match regexp clojure-1.9-compiler-error)
- (match-string 2 clojure-1.9-compiler-error))
- :to-equal "/tmp/foo/src/foo/core.clj")))
(it "Recognizes a clojure-1.10 error message"
(let ((clojure-1.10-compiler-error "Syntax error compiling at
(src/ardoq/service/workspace_service.clj:227:3)."))
(expect clojure-1.10-compiler-error :to-match regexp)
