Skip to content

Commit 2f6c66f

Browse files
committed
Reorganize dev and test code, bump dependencies
1 parent 3a01433 commit 2f6c66f

File tree

12 files changed

+30
-39
lines changed

12 files changed

+30
-39
lines changed

.github/workflows/clojure.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919

2020
- name: Setup Java
2121
uses: actions/setup-java@v5
@@ -24,12 +24,12 @@ jobs:
2424
distribution: 'corretto'
2525

2626
- name: Install clojure tools
27-
uses: DeLaGuardo/setup-clojure@13.4
27+
uses: DeLaGuardo/setup-clojure@13.5
2828
with:
29-
cli: 1.12.2.1565
29+
cli: 1.12.4.1582
3030

3131
- name: Cache clojure dependencies
32-
uses: actions/cache@v4
32+
uses: actions/cache@v5
3333
with:
3434
path: |
3535
~/.m2/repository

deps.edn

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
{:paths ["src"]
2-
:deps {org.clojure/clojure {:mvn/version "1.12.2"}}
2+
:deps {org.clojure/clojure {:mvn/version "1.12.4"}}
33

44
:aliases
55
{:test
66
;; clj -X:test
77
{:extra-paths ["test" "test-resources"]
8-
:extra-deps {criterium/criterium {:mvn/version "0.4.6"}
9-
org.clojure/core.async {:mvn/version "1.8.741"}
8+
:extra-deps {org.clojure/core.async {:mvn/version "1.8.741"}
109
nubank/matcher-combinators {:mvn/version "3.9.2"}
11-
io.github.tonsky/clj-reload {:mvn/version "0.9.8"}
1210
io.github.cognitect-labs/test-runner {:git/tag "v0.5.1"
1311
:git/sha "dfb30dd"}}
1412
:jvm-opts ["-Dclj-commons.ansi.enabled=true"]
@@ -17,7 +15,7 @@
1715

1816
;; Used when generating the :pom for install & deploy
1917
:pom
20-
{:extra-deps {nrepl/nrepl {:mvn/version "1.4.0"
18+
{:extra-deps {nrepl/nrepl {:mvn/version "1.5.2"
2119
:optional true}}}
2220

2321
;; clj -T:build <command>
@@ -36,7 +34,12 @@
3634
:1.10
3735
{:override-deps {org.clojure/clojure ^:antq/exclude {:mvn/version "1.10.3"}}}
3836

39-
;; clj -M:test:demo
37+
:dev
38+
{:extra-paths ["dev"]
39+
:extra-deps {criterium/criterium {:mvn/version "0.4.6"}
40+
io.github.tonsky/clj-reload {:mvn/version "1.0.0"}}}
41+
42+
;; clj -M:dev:demo
4043
:demo
4144
{:main-opts ["-m" "demo"]}
4245

@@ -46,11 +49,11 @@
4649
;; clj -M:lint
4750

4851
:lint
49-
{:deps {clj-kondo/clj-kondo {:mvn/version "2025.07.28"}}
50-
:main-opts ["-m" "clj-kondo.main" "--lint" "src"]}
52+
{:deps {clj-kondo/clj-kondo {:mvn/version "2026.01.12"}}
53+
:main-opts ["-m" "clj-kondo.main" "--lint" "src" "test"]}
5154

5255
:nrepl
53-
{:extra-deps {nrepl/nrepl {:mvn/version "1.4.0"}}
56+
{:extra-deps {nrepl/nrepl {:mvn/version "1.5.2"}}
5457
:main-opts ["-m" "nrepl.cmdline"]}
5558

5659
:repl

test/demo.clj renamed to dev/demo.clj

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
[clojure.java.io :as io]
1010
[clojure.repl :refer [pst]]
1111
[criterium.core :as c]
12-
playground
13-
[clojure.test :refer [report deftest is]])
12+
playground)
1413
(:import
1514
(java.nio.file Files)
1615
(java.sql SQLException)))
@@ -78,10 +77,6 @@
7877
(throw (RuntimeException. "Big Boom"))
7978
(interloper countdown-alt (dec n))))
8079

81-
(defn test-failure
82-
[]
83-
(report {:type :error :expected nil :actual (make-ex-info)}))
84-
8580
(defn fake-jdbc-error
8681
[]
8782
(run! pout
@@ -136,7 +131,7 @@
136131

137132

138133
(println "\nBinary output:\n")
139-
(-> (io/file "test/tiny-clojure.gif")
134+
(-> (io/file "test-resources/tiny-clojure.gif")
140135
.toPath
141136
Files/readAllBytes
142137
(b/print-binary {:ascii true}))
@@ -158,17 +153,6 @@
158153

159154
(println))
160155

161-
(deftest fail-wrong-exception
162-
(is (thrown? IllegalArgumentException
163-
(jdbc-update))))
164-
165-
(deftest error-thrown-exception
166-
(jdbc-update))
167-
168-
(deftest fail-wrong-message
169-
(is (thrown-with-msg? SQLException #"validation failure"
170-
(jdbc-update))))
171-
172156
(comment
173157

174158
(require '[clojure.core.async :refer [chan <!! close! thread]])
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
(ns user
2-
(:require matcher-combinators.clj-test))
1+
(ns user)
32

43
(alter-var-root #'*warn-on-reflection* (constantly true))

test/clj_commons/ansi_test.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[clj-commons.pretty-impl :refer [csi]]
88
[matcher-combinators.matchers :as m]))
99

10-
(use-fixtures :once tc/spec-fixture)
10+
(use-fixtures :once tc/spec-fixture tc/force-ansi-fixture)
1111

1212
(deftest sanity-check
1313
(is (= true *color-enabled*)))

test/clj_commons/binary_test.clj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[clojure.test :refer [deftest is are use-fixtures]])
88
(:import (java.nio ByteBuffer)))
99

10-
(use-fixtures :once tc/spec-fixture)
10+
(use-fixtures :once tc/spec-fixture tc/force-ansi-fixture)
1111

1212
(defn- format-binary-plain
1313
[input]
@@ -119,5 +119,3 @@
119119
"\u001B" "\u001Cxyz"
120120
["{0;90}0000:{} {0;32;102;2}1B{} {0;102}--{} {0;102}--{} {0;102}--{} │ {0;32;101;2}1C{} {0;36;101}78{} {0;36;101}79{} {0;36;101}7A{}"]
121121
))
122-
123-

0 commit comments

Comments
 (0)