Skip to content

Commit 2cd2410

Browse files
committed
Reflect truth of min Clojure version required
Although we are testing against Clojure v1.9, was specifying v1.10.3 in deps.edn as default dep. Now specifying Clojure v1.9.0 in deps.edn as default dep (and therefore also pom.xml). Adjusted deps.edn aliases to specifically include v1.10 where currently needed. Closes #142
1 parent cd8c5c7 commit 2cd2410

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

CHANGELOG.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ For a list of breaking changes see link:#v1-breaking[breaking changes].
1616

1717
=== Unreleased
1818

19+
* rewrite-clj now explicitly depends on the minimum version of Clojure required, v1.9.0, rather than v1.10.3 https://github.com/clj-commons/rewrite-clj/issues/142[#142]
20+
1921
=== v1.0.591-alpha
2022

2123
* namespaced map should allow all Clojure whitespace between prefix and map https://github.com/clj-commons/rewrite-clj/issues/140[#140]

deps.edn

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{:paths ["src"]
22

3-
:deps {org.clojure/clojure {:mvn/version "1.10.3"}
3+
:deps {org.clojure/clojure {:mvn/version "1.9.0"}
44
org.clojure/tools.reader {:mvn/version "1.3.5"}}
55

66
:aliases {;;
@@ -26,15 +26,17 @@
2626
:extra-paths ["test"]}
2727

2828
;; document block testing
29-
:test-doc-blocks {:replace-deps {lread/test-doc-blocks {:mvn/version "1.0.114-alpha"}}
29+
:test-doc-blocks {:replace-deps {org.clojure/clojure {:mvn/version "1.10.3"}
30+
lread/test-doc-blocks {:mvn/version "1.0.114-alpha"}}
3031
:replace-paths []
3132
:ns-default lread.test-doc-blocks
3233
:exec-args {:docs ["doc/01-user-guide.adoc"
3334
"doc/design/01-merging-rewrite-clj-and-rewrite-cljs.adoc"
3435
"doc/design/namespaced-elements.adoc"
3536
"src/rewrite_clj/node.cljc"]}}
3637

37-
:test-docs {:extra-paths ["target/test-doc-blocks/test"]}
38+
:test-docs {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}
39+
:extra-paths ["target/test-doc-blocks/test"]}
3840

3941
;; kaocha for clojure testing
4042
:kaocha {:extra-deps {lambdaisland/kaocha {:mvn/version "1.0.732"}
@@ -61,7 +63,8 @@
6163
:extra-deps {org.clojure/tools.namespace {:mvn/version "1.1.0"}
6264
cli-matic/cli-matic {:mvn/version "0.4.3"}}}
6365

64-
:apply-import-vars {:extra-deps {metosin/malli {:mvn/version "0.3.0"}
66+
:apply-import-vars {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}
67+
:extra-deps {metosin/malli {:mvn/version "0.3.0"}
6568
io.aviso/pretty {:mvn/version "0.1.36"}}
6669
:ns-default lread.apply-import-vars}
6770

@@ -72,13 +75,15 @@
7275
;; sci-test - interpret tests via sci over natively compiled rewrite-clj
7376
;; native-test - natively compile src and tests and run
7477

75-
:sci-test {:extra-paths ["target/generated/sci-test/src"]
78+
:sci-test {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}
79+
:extra-paths ["target/generated/sci-test/src"]
7680
:extra-deps {lread/sci-test {:git/url "https://github.com/lread/sci-test.git"
7781
:sha "dac1979c96c51a6bb53108b65c8270d8f30c67fa"}}}
7882

79-
:native-test {:extra-paths ["target/generated/graal"]}
83+
:native-test {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}
84+
:extra-paths ["target/generated/graal"]}
8085

81-
;; usage -A:sci-test:gen-reflection
86+
;; usage -M:sci-test:gen-reflection
8287
:gen-reflection {:main-opts ["-m" "sci-test.generate-reflection-file"]}
8388

8489
;;

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>org.clojure</groupId>
1919
<artifactId>clojure</artifactId>
20-
<version>1.10.3</version>
20+
<version>1.9.0</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>org.clojure</groupId>

0 commit comments

Comments
 (0)