Skip to content

Commit 0b1039e

Browse files
authored
dev & ci: more clojure 1.12 (#316)
Now that clojure 1.12 has gone gold: - reduce native image test to 1.12 only (was 1.11 and 1.12) - whereever we were specifying 1.11 specify 1.12 instead
1 parent 1dce335 commit 0b1039e

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.github/workflows/native-image-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
os: [ windows, ubuntu, macos ]
2020
java-version: [ '22.0.2' ]
2121
test: [ native, native-sci ]
22-
clojure-version: [ '1.11', '1.12' ]
22+
clojure-version: [ '1.12' ]
2323

2424
name: ${{ matrix.os }},jdk${{ matrix.java-version }},${{ matrix.test }},clj${{ matrix.clojure-version }}
2525

deps.edn

+8-8
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
:lint-cache {:replace-paths ["src"]} ;; when building classpath we want to exclude resources
5252
;; so we do not pick up our own clj-kondo config exports
5353
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.08.29"}}
54-
:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
54+
:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}
5555
:main-opts ["-m" "clj-kondo.main"]}
5656

5757
:eastwood {:extra-deps {jonase/eastwood {:mvn/version "1.4.3"}}
@@ -74,7 +74,7 @@
7474
:test-isolated {:extra-paths ["test-isolated"]}
7575

7676
;; document block testing
77-
:test-doc-blocks {:replace-deps {org.clojure/clojure {:mvn/version "1.11.4"}
77+
:test-doc-blocks {:replace-deps {org.clojure/clojure {:mvn/version "1.12.0"}
7878
com.github.lread/test-doc-blocks {:mvn/version "1.1.20"}}
7979
:replace-paths []
8080
:ns-default lread.test-doc-blocks
@@ -83,7 +83,7 @@
8383
"doc/design/namespaced-elements.adoc"
8484
"src/rewrite_clj/node.cljc"]}}
8585

86-
:test-docs {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
86+
:test-docs {:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}
8787
:extra-paths ["target/test-doc-blocks/test"]}
8888

8989
;; kaocha for testing clojure versions>= v1.9
@@ -100,7 +100,7 @@
100100

101101
;; figwheel for clojurescript testing during dev
102102
:fig-test {:extra-deps {com.bhauman/figwheel-main {:mvn/version "0.2.18"}}
103-
:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
103+
:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}
104104
:extra-paths ["target" "test"]
105105
:main-opts ["-m" "figwheel.main" "-b" "fig" "-r"]}
106106

@@ -115,11 +115,11 @@
115115
;; General script deps
116116
;;
117117
:script {:extra-paths ["script"]
118-
:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
118+
:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}
119119
:extra-deps {org.clojure/tools.namespace {:mvn/version "1.5.0"}
120120
cli-matic/cli-matic {:mvn/version "0.5.4"}}}
121121

122-
:apply-import-vars {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
122+
:apply-import-vars {:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}
123123
:extra-deps {metosin/malli {:mvn/version "0.16.4"}
124124
io.aviso/pretty {:mvn/version "1.4.4"}}
125125
:ns-default lread.apply-import-vars}
@@ -131,7 +131,7 @@
131131
;; graal:sci-test - interpret tests via sci over natively compiled rewrite-clj
132132
;; graal:native-test - natively compile src and tests and run
133133

134-
:graal {:override-deps {org.clojure/clojure {:mvn/version "1.11.4"}}
134+
:graal {:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}
135135
:extra-deps {com.github.clj-easy/graal-build-time {:mvn/version "1.0.5"}}}
136136

137137

@@ -161,7 +161,7 @@
161161
:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "2.9.1221"}
162162
org.slf4j/slf4j-simple {:mvn/version "2.0.16"} ;; to rid ourselves of logger warnings
163163
}
164-
:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
164+
:override-deps {org.clojure/clojure {:mvn/version "1.12.0"}}
165165
:main-opts ["-m" "antq.core"
166166
"--ignore-locals"
167167
"--exclude=lambdaisland/[email protected]" ;; breaks clojure 1.9 compat, let's wait to see if that was intentional

script/dev_repl.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
(if (:help opts)
4545
(usage-help)
4646
(do (status/line :head "Launching Clojure %s nREPL" (name flavor))
47-
(process/exec "clj" (str "-M:1.11:test-common:nrepl:nrepl/" (case flavor
47+
(process/exec "clj" (str "-M:1.12:test-common:nrepl:nrepl/" (case flavor
4848
:cljs "cljs:cljs"
4949
:jvm "jvm"))
5050
"-h" (:host opts)

script/test_jvm_sci.clj

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
[helper.shell :as shell]
66
[lread.status-line :as status]))
77

8-
(def allowed-clojure-versions '("1.10" "1.11"))
8+
(def allowed-clojure-versions '("1.11" "1.12"))
99

1010
(def args-usage "Valid args: [options]
1111
1212
Options:
13-
-v, --clojure-version VERSION Test with Clojure [1.10, 1.11] [default: 1.11]
13+
-v, --clojure-version VERSION Test with Clojure [1.11, 1.12] [default: 1.12]
1414
--help Show this help")
1515

1616

script/test_native.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
(def args-usage "Valid args: [options]
2323
2424
Options:
25-
-v, --clojure-version VERSION Test with Clojure [1.10, 1.11, 1.12] [default: 1.11]
25+
-v, --clojure-version VERSION Test with Clojure [1.10, 1.11, 1.12] [default: 1.12]
2626
--help Show this help")
2727

2828

script/test_native_sci.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
(def args-usage "Valid args: [options]
3030
3131
Options:
32-
-v, --clojure-version VERSION Test with Clojure [1.10, 1.11, 1.12] [default: 1.11]
32+
-v, --clojure-version VERSION Test with Clojure [1.10, 1.11, 1.12] [default: 1.12]
3333
--help Show this help")
3434

3535

0 commit comments

Comments
 (0)