Skip to content

Commit b879fe8

Browse files
committed
internal & tests deps: update
Of note: - Clojure 1.11 released - ci graal native tests now target this version only - graal native test scripts now default to Clojure 1.11 - opted to have clj tests hit Clojure 1.8 by default, our lowest supported version - addressed npm security warning - bumped sci-test to test with sci 0.3.3
1 parent 28efd64 commit b879fe8

File tree

7 files changed

+56
-57
lines changed

7 files changed

+56
-57
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
os: [ windows-latest, ubuntu-latest, macos-latest ]
1111
graal-java: [ 11 ]
1212
test: [ test-native, test-native-sci ]
13-
clojure-version: [ '1.10', '1.11' ]
13+
clojure-version: [ '1.11' ]
1414

1515
name: ${{ matrix.os }},jdk ${{ matrix.graal-java }},${{ matrix.test }},clj ${{ matrix.clojure-version }}
1616

deps.edn

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
:1.8 {:override-deps {org.clojure/clojure {:mvn/version "1.8.0"}}}
1010
:1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
1111
:1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
12-
;; We also test against
13-
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.0-rc1"}}}
12+
:1.11 {:override-deps {org.clojure/clojure {:mvn/version "1.11.0"}}}
1413

1514
;;
1615
;; ClojureScript version we test with (and support)
@@ -100,12 +99,12 @@
10099
;; graal:sci-test - interpret tests via sci over natively compiled rewrite-clj
101100
;; graal:native-test - natively compile src and tests and run
102101

103-
:graal {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}
102+
:graal {:override-deps {org.clojure/clojure {:mvn/version "1.11.0"}}
104103
:extra-deps {com.github.clj-easy/graal-build-time {:mvn/version "0.1.4"}}}
105104

106105
:sci-test {:extra-paths ["target/generated/sci-test/src"]
107106
:extra-deps {lread/sci-test {:git/url "https://github.com/lread/sci-test.git"
108-
:sha "929fb7d5ba937abe62b2085d193b5e3d43ce616e"}}}
107+
:sha "c2adbc30516e4e50099a86ae693693237f2ea674"}}}
109108

110109
:native-test {:extra-paths ["target/generated/graal"]}
111110

package-lock.json

Lines changed: 48 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

script/test_clj.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
(def args-usage "Valid args: [options]
2929
3030
Options:
31-
-v, --clojure-version VERSION Test with Clojure [1.8, 1.9, 1.10, 1.11] [default: 1.10]
31+
-v, --clojure-version VERSION Test with Clojure [1.8, 1.9, 1.10, 1.11] [default: 1.8]
3232
--help Show this help")
3333

3434
(defn -main [& args]

script/test_jvm_sci.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
(def args-usage "Valid args: [options]
1111
1212
Options:
13-
-v, --clojure-version VERSION Test with Clojure [1.10, 1.11] [default: 1.10]
13+
-v, --clojure-version VERSION Test with Clojure [1.10, 1.11] [default: 1.11]
1414
--help Show this help")
1515

1616

script/test_native.clj

Lines changed: 1 addition & 1 deletion
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] [default: 1.10]
25+
-v, --clojure-version VERSION Test with Clojure [1.10, 1.11] [default: 1.11]
2626
--help Show this help")
2727

2828

script/test_native_sci.clj

Lines changed: 1 addition & 1 deletion
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] [default: 1.10]
32+
-v, --clojure-version VERSION Test with Clojure [1.10, 1.11] [default: 1.11]
3333
--help Show this help")
3434

3535

0 commit comments

Comments
 (0)