Merge pull request #17 from liquidz/dev

Next release
liquidz · Apr 27, 2024 · 7a1f6ba · 7a1f6ba
2 parents 6969d93 + 5b608b7
commit 7a1f6ba
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 26 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -4,11 +4,11 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: DeLaGuardo/setup-clojure@master
         with:
           tools-deps: latest
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.m2
           key: coverage-m2-${{ hashFiles('deps.edn') }}-v1

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -7,7 +7,7 @@ jobs:
   antq:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: liquidz/antq-action@main
         with:
           excludes: 'lambdaisland/kaocha'
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -4,7 +4,7 @@ jobs:
   clj-kondo:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: DeLaGuardo/setup-clojure@master
         with:
           clj-kondo: latest
@@ -13,7 +13,7 @@ jobs:
   cljstyle:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: DeLaGuardo/setup-clojure@master
         with:
           cljstyle: latest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,11 +5,11 @@ jobs:
   tag-and-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: '11'
@@ -20,7 +20,7 @@ jobs:
         with:
           cli: latest
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.m2
           key: test-m2-${{ hashFiles('deps.edn') }}-v1

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,20 +5,20 @@ jobs:
   test-clj:
     strategy:
       matrix:
-        java: ['8', '11', '17']
+        java: ['8', '11', '17', '21']
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: ${{ matrix.java }}
       - run: java -version
       - uses: DeLaGuardo/setup-clojure@master
         with:
           cli: latest
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.m2
           key: test-m2-${{ hashFiles('deps.edn') }}-v1
@@ -28,11 +28,11 @@ jobs:
   test-cljs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: DeLaGuardo/setup-clojure@master
         with:
           cli: latest
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.m2
           key: test-m2-${{ hashFiles('deps.edn') }}-v1
@@ -41,12 +41,12 @@ jobs:
   test-bb:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: DeLaGuardo/setup-clojure@master
         with:
           cli: latest
           bb: latest
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.m2
           key: test-m2-${{ hashFiles('deps.edn') }}-v1

diff --git a/Makefile b/Makefile
@@ -13,7 +13,6 @@ test: test-clj test-bb test-cljs test-nbb ## Run all tests
 
 .PHONY: test-clj
 test-clj: ## Run clj tests
-	clojure -M:dev:1.9:test-clj
 	clojure -M:dev:1.10:test-clj
 	clojure -M:dev:test-clj
 

diff --git a/build.edn b/build.edn
@@ -1,4 +1,4 @@
 {:lib com.github.liquidz/merr
  :description "Minimal and good enough error handling library for Clojure/ClojureScript"
- :version "0.4.{{git/commit-count}}"
+ :version "1.0.{{git/commit-count}}"
  :github-actions? true}
diff --git a/deps.edn b/deps.edn
@@ -1,25 +1,22 @@
 {:paths ["src" "resources"]
- :deps {org.clojure/clojure {:mvn/version "1.11.1"}}
+ :deps {org.clojure/clojure {:mvn/version "1.11.3"}}
 
  :aliases
  {:dev
   {:extra-paths ["dev" "test"]
-   :extra-deps {lambdaisland/kaocha {:mvn/version "1.80.1274"}
+   :extra-deps {lambdaisland/kaocha {:mvn/version "1.88.1376"}
                 com.github.liquidz/testdoc {:mvn/version "1.5.109"}
                 orchestra/orchestra {:mvn/version  "2021.01.01-1"}}}
 
-  :1.9
-  {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
-
   :1.10
   {:override-deps {org.clojure/clojure {:mvn/version "1.10.3"}}}
 
   :test-clj
   {:main-opts ["-m" "kaocha.runner"]}
 
   :test-cljs
-  {:extra-deps {olical/cljs-test-runner {:mvn/version "3.8.0"}
-                org.clojure/clojurescript {:mvn/version "1.11.60"}}
+  {:extra-deps {olical/cljs-test-runner {:mvn/version "3.8.1"}
+                org.clojure/clojurescript {:mvn/version "1.11.132"}}
    :main-opts ["-m" "cljs-test-runner.main"]}
 
   :outdated
@@ -31,5 +28,5 @@
    :main-opts ["-m" "cloverage.coverage"]}
 
   :build
-  {:deps {com.github.liquidz/build.edn {:mvn/version "0.9.203"}}
+  {:deps {com.github.liquidz/build.edn {:mvn/version "0.11.257"}}
    :ns-default build-edn.main}}}