Skip to content

Commit 9599297

Browse files
authoredJun 13, 2024··
Decrease minimal Clojure version in Leiningen plugin to 1.10.0 (#883)
Turns out, it was a bad idea to set the minimal Clojure version to 1.10.3 - a patch version that was released much later than the original 1.10.0. As we don't really need it, it's better to relax the requirement.
1 parent 7fdca13 commit 9599297

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed
 

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## master (unreleased)
44

5+
### Changes
6+
7+
* [#883](https://github.com/clojure-emacs/cider-nrepl/pull/883): Reduce minimal Clojure requirement to 1.10.0.
8+
59
## Bugs fixed
610

711
* [CIDER#3684](https://github.com/clojure-emacs/cider/issues/3684): Don't apply indentation inference for `:style/indent nil` metadata.

‎src/cider_nrepl/plugin.clj

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[leiningen.core.main :as lein]))
88

99
(def minimum-versions {:lein "2.8.3"
10-
:clojure "1.10.3"})
10+
:clojure "1.10.0"})
1111

1212
(defn valid-version? [kind version] (lein/version-satisfies? version (minimum-versions kind)))
1313
(def valid-lein-version? (partial valid-version? :lein))
@@ -46,9 +46,9 @@
4646
(when-not lein-version-ok?
4747
(lein/warn "Warning: cider-nrepl requires Leiningen 2.8.3 or greater."))
4848
(when-not clojure-version-ok?
49-
(lein/warn "Warning: cider-nrepl requires Clojure 1.10.3 or greater."))
49+
(lein/warn "Warning: cider-nrepl requires Clojure 1.10.0 or greater."))
5050
(when clojure-excluded?
51-
(lein/warn "Warning: Clojure is excluded, assuming an appropriate fork (Clojure 1.10.3 or later) is provided."))
51+
(lein/warn "Warning: Clojure is excluded, assuming an appropriate fork (Clojure 1.10.0 or later) is provided."))
5252
(when-not (and lein-version-ok? clojure-version-ok?)
5353
(lein/warn "Warning: cider-nrepl will not be included in your project."))
5454

‎test/clj/cider/nrepl/plugin_test.clj

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
(is (= expected-output
1616
(middleware {:dependencies [['org.clojure/clojure]]}))))
1717
(testing "defined versions also work"
18-
(is (= (update-in expected-output [:dependencies 0] conj "1.10.3")
19-
(middleware {:dependencies [['org.clojure/clojure "1.10.3"]]})))))
18+
(is (= (update-in expected-output [:dependencies 0] conj "1.10.0")
19+
(middleware {:dependencies [['org.clojure/clojure "1.10.0"]]})))))

‎test/common/cider_nrepl/plugin_test.clj

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
(binding [lein/*info* false]
1818
(with-redefs [lein/leiningen-version (constantly (plugin/minimum-versions :lein))]
1919
(testing "Valid Lein version; valid Clojure version"
20-
(let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.10.3"]]})]
20+
(let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.10.0"]]})]
2121
(is (contains-cider-nrepl-dep? project))
2222
(is (contains-cider-nrepl-middleware? project))))
2323

@@ -39,7 +39,7 @@
3939

4040
(with-redefs [lein/leiningen-version (constantly "2.5.1")]
4141
(testing "Invalid Lein version; valid Clojure version"
42-
(let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.10.3"]]})]
42+
(let [project (plugin/middleware '{:dependencies [[org.clojure/clojure "1.10.0"]]})]
4343
(is (not (contains-cider-nrepl-dep? project)))
4444
(is (not (contains-cider-nrepl-middleware? project)))))
4545

0 commit comments

Comments
 (0)
Please sign in to comment.