Skip to content

Commit

Permalink
test & ci: bump deps to current (#260)
Browse files Browse the repository at this point in the history 
Of note: bump GraalVM to v22
  • Loading branch information
@lread
lread committed Mar 23, 2024
1 parent b31add7 commit fb80e82
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/native-image-test.yml
View file
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os: [ windows, ubuntu, macos ]
java-version: [ '21.0.2' ]
java-version: [ '22' ]
test: [ native, native-sci ]
clojure-version: [ '1.11', '1.12' ]

Expand Down
20 changes: 10 additions & 10 deletions deps.edn
View file
Expand Up @@ -31,8 +31,8 @@
;;
:lint-cache {:replace-paths ["src"]} ;; when building classpath we want to exclude resources
;; so we do not pick up our own clj-kondo config exports
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.03.05"}}
:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
:clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2024.03.13"}}
:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
:main-opts ["-m" "clj-kondo.main"]}

:eastwood {:extra-deps {jonase/eastwood {:mvn/version "1.4.2"}}
Expand All @@ -55,7 +55,7 @@
:test-isolated {:extra-paths ["test-isolated"]}

;; document block testing
:test-doc-blocks {:replace-deps {org.clojure/clojure {:mvn/version "1.11.1"}
:test-doc-blocks {:replace-deps {org.clojure/clojure {:mvn/version "1.11.2"}
com.github.lread/test-doc-blocks {:mvn/version "1.0.166-alpha"}}
:replace-paths []
:ns-default lread.test-doc-blocks
Expand All @@ -64,7 +64,7 @@
"doc/design/namespaced-elements.adoc"
"src/rewrite_clj/node.cljc"]}}

:test-docs {:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
:test-docs {:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
:extra-paths ["target/test-doc-blocks/test"]}

;; kaocha for testing clojure versions>= v1.9
Expand All @@ -81,7 +81,7 @@

;; figwheel for clojurescript testing during dev
:fig-test {:extra-deps {com.bhauman/figwheel-main {:mvn/version "0.2.18"}}
:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
:extra-paths ["target" "test"]
:main-opts ["-m" "figwheel.main" "-b" "fig" "-r"]}

Expand All @@ -96,12 +96,12 @@
;; General script deps
;;
:script {:extra-paths ["script"]
:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
:extra-deps {org.clojure/tools.namespace {:mvn/version "1.5.0"}
cli-matic/cli-matic {:mvn/version "0.5.4"}}}

:apply-import-vars {:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
:extra-deps {metosin/malli {:mvn/version "0.14.0"}
:apply-import-vars {:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
:extra-deps {metosin/malli {:mvn/version "0.15.0"}
io.aviso/pretty {:mvn/version "1.4.4"}}
:ns-default lread.apply-import-vars}

Expand All @@ -112,7 +112,7 @@
;; graal:sci-test - interpret tests via sci over natively compiled rewrite-clj
;; graal:native-test - natively compile src and tests and run

:graal {:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
:graal {:override-deps {org.clojure/clojure {:mvn/version "1.11.2"}}
:extra-deps {com.github.clj-easy/graal-build-time {:mvn/version "1.0.5"}}}


Expand All @@ -136,7 +136,7 @@
;;
;; Deployment
;;
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}}
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.0"}}
:extra-paths ["src" "build"]
:ns-default build}

Expand Down
4 changes: 2 additions & 2 deletions doc/02-developer-guide.adoc
View file
Expand Up @@ -12,7 +12,7 @@ We make use of planck for cljs bootstrap (aka cljs self-hosted) testing.
Planck is currently not available for Windows.

We test that rewrite-clj operates as expected when natively compile via GraalVM.
Automated testing is setup using GraalVM JDK 21.
Automated testing is setup using GraalVM JDK 22.
At this time we only test against the Community Edition.

== Prerequisites
Expand All @@ -21,7 +21,7 @@ At this time we only test against the Community Edition.
* Clojure v1.10.1.697 or above for `clojure` command
** Note that rewrite-clj v1 itself supports Clojure v1.8 and above
* Babashka v0.3.7 or above
* Current release of GraalVM JDK 21, if you want to run GraalVM native image tests
* Current release of GraalVM JDK 22, if you want to run GraalVM native image tests

=== Windows Notes

Expand Down
53 changes: 28 additions & 25 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -6,6 +6,6 @@
"karma-cljs-test": "^0.1.0",
"karma-junit-reporter": "^2.0.0",
"karma-spec-reporter": "^0.0.36",
"shadow-cljs": "^2.27.5"
"shadow-cljs": "^2.28.2"
}
}
2 changes: 1 addition & 1 deletion script/helper/graal.clj
View file
Expand Up @@ -44,7 +44,7 @@
[]
(status/line :head "Locate GraalVM native-image")
(let [native-image (or (find-graal-prog "native-image")
(status/die 1 "failed to to find GraalVM native-image, it should be bundle with your Graal installation"))]
(status/die 1 "failed to to find GraalVM native-image, it should be bundled with your Graal installation"))]
(status/line :detail (str "found: " native-image))
native-image))

Expand Down
4 changes: 2 additions & 2 deletions script/test_libs.clj
View file
Expand Up @@ -315,7 +315,7 @@
"bin/test unit"]}
{:name "clojure-lsp"
:platforms [:clj]
:version "2024.03.01-11.37.51"
:version "2024.03.13-13.11.00"
:github-release {:repo "clojure-lsp/clojure-lsp"}
:patch-fn clojure-lsp-patch
:show-deps-fn clojure-lsp-deps
Expand Down Expand Up @@ -430,7 +430,7 @@
:show-deps-fn lein-deps-tree
:test-cmds ["lein test"]}
{:name "zprint"
:version "1.2.8"
:version "1.2.9"
:note "1) planck cljs tests disabled for now: https://github.com/planck-repl/planck/issues/1088"
:platforms [:clj :cljs]
:github-release {:repo "kkinnear/zprint"}
Expand Down

0 comments on commit fb80e82

Please sign in to comment.