Skip to content

Commit 147977f

Browse files
ikitommiikitommi
committed
format & update deps
1 parent 3ebd6c4 commit 147977f

File tree

7 files changed

+61
-77
lines changed

7 files changed

+61
-77
lines changed

‎.github/workflows/clojure.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
runs-on: ubuntu-latest
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Setup Java ${{ matrix.jdk }}
25-
uses: actions/setup-java@v3.12.0
25+
uses: actions/setup-java@v4
2626
with:
2727
distribution: zulu
2828
java-version: ${{ matrix.jdk }}
@@ -42,9 +42,9 @@ jobs:
4242

4343
runs-on: ubuntu-latest
4444
steps:
45-
- uses: actions/checkout@v3
45+
- uses: actions/checkout@v4
4646
- name: Setup Java 11
47-
uses: actions/setup-java@v3.12.0
47+
uses: actions/setup-java@v4
4848
with:
4949
distribution: zulu
5050
java-version: 11
@@ -54,7 +54,7 @@ jobs:
5454
with:
5555
cli: latest
5656
- name: Setup Node.js
57-
uses: actions/setup-node@v3.8.1
57+
uses: actions/setup-node@v4.0.1
5858
with:
5959
node-version: 16
6060
- name: Install dependencies
@@ -67,9 +67,9 @@ jobs:
6767

6868
runs-on: ubuntu-latest
6969
steps:
70-
- uses: actions/checkout@v3
70+
- uses: actions/checkout@v4
7171
- name: Setup Java 11
72-
uses: actions/setup-java@v3.12.0
72+
uses: actions/setup-java@v4
7373
with:
7474
distribution: zulu
7575
java-version: 11

‎app/malli/app.cljc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
(:require [malli.core :as m]))
66

77
(m/validate
8-
[:map [:maybe [:maybe :string]]]
9-
{:maybe "sheep"})
8+
[:map [:maybe [:maybe :string]]]
9+
{:maybe "sheep"})
1010
; => true

‎app/malli/app2.cljc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
:map (m/-map-schema)})
1616

1717
(m/validate
18-
[:map [:maybe [:maybe :string]]]
19-
{:maybe "sheep"}
20-
{:registry registry})
18+
[:map [:maybe [:maybe :string]]]
19+
{:maybe "sheep"}
20+
{:registry registry})
2121
; => true
2222

2323
(mr/set-default-registry! registry)
2424

2525
(m/validate
26-
[:map [:maybe [:maybe :string]]]
27-
{:maybe "sheep"})
26+
[:map [:maybe [:maybe :string]]]
27+
{:maybe "sheep"})
2828
; => true

‎app/malli/dev_preload.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(ns malli.dev-preload
22
{:dev/always true}
33
(:require
4-
[malli.instrument-app]
5-
[malli.dev.cljs :as dev]))
4+
[malli.instrument-app]
5+
[malli.dev.cljs :as dev]))
66

77
(dev/start!)

‎app/malli/helpers2.cljs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
(ns malli.helpers2
22
(:require
3-
[malli.experimental :as mx]
4-
[malli.core :as m]
5-
[malli.helpers :as h :refer [int-schema]]))
3+
[malli.experimental :as mx]
4+
[malli.core :as m]
5+
[malli.helpers :as h :refer [int-schema]]))
66

77
(mx/defn square-it :- h/int-schema
88
[x :- int?]
99
(str x)
1010
;(str (* x x))
1111
)
12-
13-
1412
;(mx/defn f1 [] 1)
1513
;(mx/defn f3 [x :- :int] x)
1614
;(mx/defn f4 :- [:int {:min 0}]
@@ -21,7 +19,6 @@
2119
(def AB [:map [:a [:int {:min 0}]] [:b :int]])
2220
(def CD [:map [:c [:int {:min 0}]] [:d :int]])
2321

24-
2522
;; schematized, nested keywords args
2623
(mx/defn f5 :- [:cat :int :int :int :int AB CD]
2724
"Nested Keyword argument"
@@ -32,16 +29,13 @@
3229
(mx/defn f3 [x :- :int] x)
3330
(comment
3431
(macroexpand
35-
'(mx/defn f3 [x :- :int] x)
36-
)
32+
'(mx/defn f3 [x :- :int] x))
3733
(macroexpand
38-
'(mx/defn f5 :- [:cat :int :int :int :int AB CD]
34+
'(mx/defn f5 :- [:cat :int :int :int :int AB CD]
3935
"Nested Keyword argument"
4036
[[& {:keys [a b] :as m1} :- AB]
4137
& {:keys [c d] :as m2} :- CD]
42-
[a b c d m1 m2])
43-
)
44-
)
38+
[a b c d m1 m2])))
4539

4640
;(defn square-it [x] (* x x))
4741
;(m/=> square-it [:=> [:cat h/int-schema] int-schema])

‎app/malli/instrument_app.cljs

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
(ns malli.instrument-app
22
(:require
3-
[malli.instrument :as mi-new]
4-
malli.helpers
5-
[malli.core :as m]
6-
[clojure.test.check.generators :as gen]
7-
[malli.experimental.time.generator]
8-
[malli.dev.pretty :as pretty]
9-
[malli.generator :as mg]
10-
[malli.experimental :as mx]
11-
[malli.experimental.time :as time]))
3+
[malli.instrument :as mi-new]
4+
malli.helpers
5+
[malli.core :as m]
6+
[clojure.test.check.generators :as gen]
7+
[malli.experimental.time.generator]
8+
[malli.dev.pretty :as pretty]
9+
[malli.generator :as mg]
10+
[malli.experimental :as mx]
11+
[malli.experimental.time :as time]))
1212

1313
(js/console.log "now: " (time/LocalDate.now))
1414
(js/console.log "generated: "
15-
(gen/sample (mg/-schema-generator (time/-local-date-time-schema) nil) 10))
15+
(gen/sample (mg/-schema-generator (time/-local-date-time-schema) nil) 10))
1616

1717
(js/console.log
18-
(into-array
19-
(mg/sample :time/zoned-date-time {:registry (merge (m/default-schemas) (time/schemas))})))
18+
(into-array
19+
(mg/sample :time/zoned-date-time {:registry (merge (m/default-schemas) (time/schemas))})))
2020

2121
(mx/defn my-ex-fn :- [:int]
2222
[a :- :string] (+ 5 a))
@@ -34,20 +34,19 @@
3434
;(defn add-dates [a b]
3535
; {:malli/schema [:=> [:cat :time/local-date :time/local-date] :time/local-date]}
3636

37-
3837
(defn sum [a b] (+ a b))
3938

4039
(def sum2
4140
(m/-instrument {:schema (m/schema [:=> [:cat :int :int] :int])
4241
:report (pretty/reporter)}
43-
sum))
42+
sum))
4443

4544
;(m/=> sum [:=> [:cat :int :int] :int])
4645

4746
(set! sum
48-
(m/-instrument {:schema (m/schema [:=> [:cat :int :int] :int])
49-
:report (pretty/reporter)}
50-
sum))
47+
(m/-instrument {:schema (m/schema [:=> [:cat :int :int] :int])
48+
:report (pretty/reporter)}
49+
sum))
5150

5251
(defn minus
5352
"a normal clojure function, no dependencies to malli"
@@ -57,7 +56,6 @@
5756
[x]
5857
(dec x))
5958

60-
6159
(defn plus-gen
6260
;{:malli/schema [:=> [:cat :int] [:int {:min 6}]]}
6361
[x]
@@ -67,7 +65,6 @@
6765
; @mi/instrumented-vars
6866
; ((get @mi/instrumented-vars `sum) 1 "2"))
6967

70-
7168
(defn plus1 [a] (inc a))
7269
;(m/=> plus1 [:=> [:cat :int] :int])
7370

@@ -98,10 +95,10 @@
9895

9996
(def pow-gen
10097
(m/-instrument
101-
{:schema [:function
102-
[:=> [:cat :int] [:int {:max 6}]]
103-
[:=> [:cat :int :int] [:int {:max 6}]]]
104-
:gen mg/generate}))
98+
{:schema [:function
99+
[:=> [:cat :int] [:int {:max 6}]]
100+
[:=> [:cat :int :int] [:int {:max 6}]]]
101+
:gen mg/generate}))
105102

106103
(defn minus2
107104
"kukka"
@@ -120,7 +117,6 @@
120117

121118
(m/=> sum3 [:=> [:cat :int :int] :int])
122119

123-
124120
(def small-int [:int {:max 6}])
125121

126122
(def MyInt (m/-simple-schema {:type 'MyInt, :pred #(and (int? %) (< 100 %))}))
@@ -142,11 +138,11 @@
142138

143139
(defn multi-arity-variadic-fn
144140
{:malli/schema
145-
[:function
141+
[:function
146142
;[:=> [:cat] [:int]]
147-
[:=> [:cat :int] [:int]]
148-
[:=> [:cat :string :string] [:string]]
149-
[:=> [:cat :string :string :string [:* :string]] [:string]]]}
143+
[:=> [:cat :int] [:int]]
144+
[:=> [:cat :string :string] [:string]]
145+
[:=> [:cat :string :string :string [:* :string]] [:string]]]}
150146
([] 500)
151147
([a] (inc a))
152148
([a b] (str a b))
@@ -182,11 +178,8 @@
182178
;; fails as it hits the last fn schema
183179
(multi-arity-variadic-fn 'a "b" "b")
184180
;(multi-arity-variadic-fn "a" "b" "c" :x)
185-
186181
)
187-
188-
(macroexpand '(mi-new/collect! {:ns ['malli.instrument-app 'malli.instrument-test 'malli.instrument.fn-schemas
189-
]}))
182+
(macroexpand '(mi-new/collect! {:ns ['malli.instrument-app 'malli.instrument-test 'malli.instrument.fn-schemas]}))
190183
(defn ^:dev/after-load x []
191184
(println "AFTER LOAD - malli.dev.cljs/start!")
192185
;(m/-deregister-metadata-function-schemas! :cljs)
@@ -212,15 +205,13 @@
212205
;(mi.old/instrument!)
213206
;(js/setTimeout try-it 100)
214207
)
215-
216-
217208
(comment
218209
(macroexpand
219-
'(dev/start!))
210+
'(dev/start!))
220211
(m/function)
221212
(@(Var. (constantly str-join) 'str-join {:metadata 'here}) [1 2])
222213
(= (Var. (constantly str-join) `str-join {:metadata 'here})
223-
#'str-join)
214+
#'str-join)
224215
(macroexpand '(dev/collect-all!))
225216

226217
(macroexpand '(mi-new/collect-all!))

‎deps.edn

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@
88
mvxcvi/arrangement {:mvn/version "2.1.0"}}
99
:aliases {:test {:extra-paths ["test"]
1010
:extra-deps {com.gfredericks/test.chuck {:mvn/version "0.2.14"}
11-
lambdaisland/kaocha {:mvn/version "1.86.1355"}
11+
lambdaisland/kaocha {:mvn/version "1.87.1366"}
1212
lambdaisland/kaocha-cljs {:mvn/version "1.5.154"}
13-
org.babashka/sci {:mvn/version "0.8.40"}
13+
org.babashka/sci {:mvn/version "0.8.41"}
1414
lambdaisland/kaocha-junit-xml {:mvn/version "1.17.101"}
1515
metosin/spec-tools {:mvn/version "0.10.6"}
1616
spec-provider/spec-provider {:mvn/version "0.4.14"}
1717
metosin/schema-tools {:mvn/version "0.13.1"}
18-
metosin/jsonista {:mvn/version "0.3.7"}
18+
metosin/jsonista {:mvn/version "0.3.8"}
1919
prismatic/schema {:mvn/version "1.4.1"}
2020
minimallist/minimallist {:mvn/version "0.0.10"}
2121
net.cgrand/seqexp {:mvn/version "0.6.2"}
22-
djblue/portal {:mvn/version "0.46.0"}
22+
djblue/portal {:mvn/version "0.51.0"}
2323
meta-merge/meta-merge {:mvn/version "1.0.0"}
2424
expound/expound {:mvn/version "0.9.0"}
2525
lambdaisland/deep-diff {:mvn/version "0.0-47"}
2626
com.bhauman/spell-spec {:mvn/version "0.1.2"}
2727
org.clojure/spec-alpha2 {:git/url "https://github.com/clojure/spec-alpha2.git"
2828
:sha "4cbfa677c4cd66339f18e1c122222c05c69e0d8e"}}}
29-
:sci {:extra-deps {org.babashka/sci {:mvn/version "0.8.40"}}}
30-
:cherry {:extra-deps {io.github.squint-cljs/cherry {:git/sha "24635085f3a268e624dee5f6b7ec049323a01173"}}}
29+
:sci {:extra-deps {org.babashka/sci {:mvn/version "0.8.41"}}}
30+
:cherry {:extra-deps {io.github.squint-cljs/cherry {:git/sha "21ec3e33d7cc5df88ba75bbb563522f843e846fd"}}}
3131
:test-sci {:extra-paths ["test-sci"]
3232
:main-opts ["-m" "cljs-test-runner.main" "-d" "test-sci" "-d" "test"]}
3333
:test-cherry {:extra-paths ["test-cherry"]
@@ -37,7 +37,7 @@
3737
com.widdindustries/cljs.java-time {:mvn/version "0.1.20"}}
3838
:extra-paths ["test" "cljs-test-runner-out/gen"]
3939
:main-opts ["-m" "cljs-test-runner.main" "-d" "test"]}
40-
:build {:deps {io.github.clojure/tools.build {:git/tag "v0.9.5" :git/sha "24f2894"}}
40+
:build {:deps {io.github.clojure/tools.build {:git/tag "v0.9.6" :git/sha "8e78bcc"}}
4141
:ns-default build}
4242
:jmh {:paths ["target/uber.jar" "classes"]
4343
:deps {jmh-clojure/jmh-clojure {:mvn/version "0.4.1"}
@@ -49,7 +49,7 @@
4949
org.clojure/tools.namespace #_:clj-kondo/ignore {:mvn/version "RELEASE"}}}
5050

5151
:shadow {:extra-paths ["app"]
52-
:extra-deps {thheller/shadow-cljs {:mvn/version "2.25.3"}
52+
:extra-deps {thheller/shadow-cljs {:mvn/version "2.26.2"}
5353
binaryage/devtools {:mvn/version "1.0.7"}}}
5454
:slow {:extra-deps {io.dominic/slow-namespace-clj
5555
{:git/url "https://git.sr.ht/~severeoverfl0w/slow-namespace-clj"
@@ -60,7 +60,7 @@
6060
:sha "b093f79420fef019faf62a75b888b5e10f4e8cc9"}}
6161
:main-opts ["-m" "mach.pack.alpha.skinny" "--no-libs"
6262
"--project-path" "malli.jar"]}
63-
:deploy {:extra-deps {slipset/deps-deploy {:mvn/version "0.2.1"}}
63+
:deploy {:extra-deps {slipset/deps-deploy {:mvn/version "0.2.2"}}
6464
:exec-fn deps-deploy.deps-deploy/deploy
6565
:exec-args {:installer :remote
6666
:artifact "malli.jar"}}
@@ -69,12 +69,11 @@
6969
"malli.jar"]}
7070
:graalvm {:extra-paths ["graal-test/src"]
7171
:extra-deps {org.clojure/clojure {:mvn/version "1.11.1"}
72-
org.babashka/sci {:mvn/version "0.8.40"}}}
72+
org.babashka/sci {:mvn/version "0.8.41"}}}
7373
:perf {:extra-paths ["perf"]
7474
:extra-deps {criterium/criterium {:mvn/version "0.4.6"}
7575
org.clojure/clojure {:mvn/version "1.11.1"}
76-
com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.0.5"}}
76+
com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.1.1"}}
7777
:jvm-opts ["-server"
7878
"-Xmx4096m"
79-
"-Dclojure.compiler.direct-linking=true"]}
80-
:clojure-11 {}}}
79+
"-Dclojure.compiler.direct-linking=true"]}}}

0 commit comments

Comments
 (0)