Skip to content

Commit 160995b

Browse files
committed
Drop support for Clojure 1.9
1 parent 4f51e94 commit 160995b

File tree

5 files changed

+13
-30
lines changed

5 files changed

+13
-30
lines changed

cider-eval.el

+2-18
Original file line numberDiff line numberDiff line change
@@ -562,11 +562,6 @@ It delegates the actual error content to the eval or op handler."
562562
(t (cider-default-err-eval-print-handler))))
563563

564564

565-
;; The format of the error messages emitted by Clojure's compiler changed in
566-
;; Clojure 1.10. That's why we're trying to match error messages to both the
567-
;; old and the new format, by utilizing a combination of two different regular
568-
;; expressions.
569-
570565
(defconst cider-clojure-1.10--location `((or "at ("
571566
(sequence "at "
572567
(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."
596591
(minimal-match (one-or-more anything)))
597592
cider-clojure-1.10--location))
598593

599-
(defconst cider-clojure-1.9-error `(sequence
600-
(zero-or-more anything)
601-
", compiling:("
602-
(group-n 2 (minimal-match (zero-or-more anything)))
603-
":"
604-
(group-n 3 (one-or-more digit))
605-
(optional ":" (group-n 4 (one-or-more digit)))
606-
")"))
607-
608594
(defconst cider-clojure-warning `(sequence
609595
(minimal-match (zero-or-more anything))
610596
(group-n 1 "warning")
@@ -619,8 +605,7 @@ It delegates the actual error content to the eval or op handler."
619605
;; which is a subset of these regexes.
620606
(defconst cider-clojure-compilation-regexp
621607
(eval
622-
`(rx bol (or ,cider-clojure-1.9-error
623-
,cider-clojure-warning
608+
`(rx bol (or ,cider-clojure-warning
624609
,cider-clojure-1.10-error
625610
,cider-clojure-unexpected-error))
626611
t)
@@ -633,8 +618,7 @@ lol in this context, compiling:(/foo/core.clj:10:1)\"
633618

634619
(defconst cider-clojure-compilation-error-regexp
635620
(eval
636-
`(rx bol (or ,cider-clojure-1.9-error
637-
,cider-clojure-1.10-error
621+
`(rx bol (or ,cider-clojure-1.10-error
638622
,cider-clojure-unexpected-error))
639623
t)
640624
"Like `cider-clojure-compilation-regexp',

cider.el

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
(null (executable-find "clojure")))
142142
"powershell"
143143
"clojure")
144-
"The command used to execute clojure with tools.deps (requires Clojure 1.9+).
144+
"The command used to execute clojure with tools.deps.
145145
Don't use clj here, as it doesn't work when spawned from Emacs due to it
146146
using rlwrap. If on Windows and no \"clojure\" executable is found we
147147
default to \"powershell\"."
@@ -535,10 +535,10 @@ the artifact.")
535535
(defconst cider-clojure-artifact-id "org.clojure/clojure"
536536
"Artifact identifier for Clojure.")
537537

538-
(defconst cider-minimum-clojure-version "1.8.0"
538+
(defconst cider-minimum-clojure-version "1.10.0"
539539
"Minimum supported version of Clojure.")
540540

541-
(defconst cider-latest-clojure-version "1.10.1"
541+
(defconst cider-latest-clojure-version "1.11.3"
542542
"Latest supported version of Clojure.")
543543

544544
(defconst cider-required-middleware-version "0.47.0"

doc/modules/ROOT/pages/about/compatibility.adoc

+8-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You can find example commands in xref:troubleshooting.adoc#navigation-to-jdk-sou
2828

2929
== Clojure
3030

31-
CIDER targets Clojure 1.9+. As Clojure doesn't have the concept of supported releases
31+
CIDER targets Clojure 1.10+. As Clojure doesn't have the concept of supported releases
3232
we have to get a bit creative to determine the minimum version to target.
3333

3434
The minimum required Clojure version is currently derived using data
@@ -175,6 +175,13 @@ Below you can find the official compatibility matrix for CIDER.
175175
| 8
176176
| 1.9
177177

178+
| 1.14
179+
| 26.1
180+
| 1.0
181+
| 0.47
182+
| 8
183+
| 1.10
184+
178185
|===
179186

180187
TIP: You can also check the requirements of a particular CIDER version by inspecting

doc/modules/ROOT/pages/usage/misc_features.adoc

-2
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,6 @@ There are a bunch of useful keybindings that are defined in browser buffers.
196196

197197
== Browsing the Clojure Spec Registry
198198

199-
If you are using Clojure 1.9 or newer you can browse the Clojure spec registry.
200-
201199
If you already know which spec you're looking for, you can type
202200
kbd:[M-x] `cider-browse-spec` and CIDER will prompt you for a
203201
spec name and then drop you into the spec browser.

test/cider-error-parsing-tests.el

-6
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,6 @@
125125
(match-string 1 clojure-compiler-warning))
126126
:to-equal "warning")))
127127
(dolist (regexp (list cider-clojure-compilation-regexp cider-clojure-compilation-error-regexp))
128-
(it "Recognizes a clojure-1.9 error message"
129-
(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)"))
130-
(expect clojure-1.9-compiler-error :to-match regexp)
131-
(expect (progn (string-match regexp clojure-1.9-compiler-error)
132-
(match-string 2 clojure-1.9-compiler-error))
133-
:to-equal "/tmp/foo/src/foo/core.clj")))
134128
(it "Recognizes a clojure-1.10 error message"
135129
(let ((clojure-1.10-compiler-error "Syntax error compiling at (src/ardoq/service/workspace_service.clj:227:3)."))
136130
(expect clojure-1.10-compiler-error :to-match regexp)

0 commit comments

Comments
 (0)