Skip to content

Commit e517733

Browse files
committed
bump deps, fix optional-require
1 parent e5196ff commit e517733

File tree

4 files changed

+31
-39
lines changed

4 files changed

+31
-39
lines changed

.github/workflows/main.yml

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

1616
steps:
1717

18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
2121

22-
- uses: DeLaGuardo/setup-clojure@11.0
22+
- uses: DeLaGuardo/setup-clojure@13.2
2323
with:
24-
cli: '1.11.1.1347'
24+
cli: '1.12.0.1530'
2525

26-
- uses: actions/cache@v3
26+
- uses: actions/cache@v4
2727
with:
2828
path: ~/.m2
2929
key: default-build
3030

3131
- run: clojure -T:build ci
3232

33-
- uses: codecov/codecov-action@v3
33+
- uses: codecov/codecov-action@v5
3434

3535
- name: clojars
3636
if: github.event.release

deps.edn

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,32 @@
44
{:dev ;general development
55
{:extra-paths ["test" "dev"],
66
:extra-deps
7-
{metosin/malli {:mvn/version "0.11.0"},
8-
com.bhauman/figwheel-main {:mvn/version "0.2.18"},
9-
io.github.robertluo/rich-comment-tests {:git/tag "v1.1.0", :git/sha "6d01d12"}}},
10-
11-
:debug ;enable flowstorm debugger for IDE working
12-
{:classpath-overrides {org.clojure/clojure nil}
13-
:jvm-opts ["-Dclojure.storm.instrumentEnable=true" "-Dclojure.storm.instrumentOnlyPrefixes=sg.flybot"],
14-
:extra-deps
15-
{com.github.jpmonettas/clojure {:mvn/version "1.12.0-alpha4_1"}
16-
com.github.jpmonettas/flow-storm-dbg {:mvn/version "3.7.1"}}},
17-
7+
{metosin/malli {:mvn/version "0.17.0"},
8+
com.bhauman/figwheel-main {:mvn/version "0.2.20"},
9+
io.github.robertluo/rich-comment-tests {:git/tag "v1.1.1", :git/sha "3f65ecb"}}},
10+
1811
:notebook ;use clerk notebook
19-
{:extra-deps {io.github.nextjournal/clerk {:mvn/version "0.14.919"}}},
20-
12+
{:extra-deps {io.github.nextjournal/clerk {:mvn/version "0.17.1102"}}},
13+
2114
:readme ;make readme.md from notebook
2215
{:extra-deps {io.github.robertluo/clerk-doc {:git/tag "v0.2.1", :git/sha "d2b37f0"}},
2316
:exec-fn robertluo.clerk-doc/clj->md,
2417
:exec-args
2518
{:from "notebook/introduction.clj", :to "README.md", :eval-code? true, :ai-improve? false}},
26-
19+
2720
:test ;test runner using kaocha
2821
{:extra-deps
29-
{lambdaisland/kaocha {:mvn/version "1.85.1342"},
22+
{lambdaisland/kaocha {:mvn/version "1.91.1392"},
3023
lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"}},
3124
:main-opts ["-m" "kaocha.runner"]},
32-
25+
3326
:cljs-test ;clojurescript test
34-
{:extra-deps {olical/cljs-test-runner {:mvn/version "3.8.0"}},
27+
{:extra-deps {olical/cljs-test-runner {:mvn/version "3.8.1"}},
3528
:main-opts ["-m" "cljs-test-runner.main"]},
36-
29+
3730
:clj-kondo ;when developing clj-kondo hooks, configs
38-
{:extra-deps {clj-kondo/clj-kondo {:mvn/version "2023.05.26"}}},
39-
31+
{:extra-deps {clj-kondo/clj-kondo {:mvn/version "2025.04.07"}}},
32+
4033
:build ;build
4134
{:deps
4235
{io.github.seancorfield/build-clj {:git/tag "v0.9.2", :git/sha "9c9f078"}},

src/sg/flybot/pullable.cljc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@
5151
(query pattern nil))
5252
([pattern context]
5353
#?(:clj
54-
#_{:clj-kondo/ignore [:unresolved-symbol]}
54+
#_{:clj-kondo/ignore [:unresolved-namespace]}
5555
(util/optional-require
56-
[sg.flybot.pullable.schema :as schema]
57-
#_{:clj-kondo/ignore [:unresolved-namespace]}
58-
(schema/check-pattern! *data-schema* pattern)
56+
sg.flybot.pullable.schema/check-pattern!
57+
(sg.flybot.pullable.schema/check-pattern! *data-schema* pattern)
5958
nil))
6059
(fn [data]
6160
(-> context

src/sg/flybot/pullable/util.cljc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; Apache License 2.0, http://www.apache.org/licenses/
33

44
(ns sg.flybot.pullable.util
5-
"misc utility functions"
5+
"misc utility functions"
66
(:require [clojure.walk :as walk]))
77

88
(defrecord DataError [data query-id reason])
@@ -25,8 +25,8 @@
2525
^:rct/test
2626
(comment
2727
(data-error {} :k) ;=>> {:query-id :k}
28-
(error? (data-error {} :k)) ;=> true
29-
)
28+
(error? (data-error {} :k))) ;=> true
29+
3030

3131
(defn named-lvar?
3232
"predict if `x` is a named logical value"
@@ -43,15 +43,15 @@
4343

4444
^:rct/test
4545
(comment
46-
(named-lvars-in-pattern '{:a ? :b ?b :c ?c}) ;=> #{?b ?c &?}
47-
)
46+
(named-lvars-in-pattern '{:a ? :b ?b :c ?c})) ;=> #{?b ?c &?}
47+
4848

4949

5050
^:rct/test
5151
(comment
5252
(named-lvar? 3) ;=> false
53-
(named-lvar? '?a) ;=>> some?
54-
)
53+
(named-lvar? '?a)) ;=>> some?
54+
5555

5656
;; To avoid hard dependency of malli.
5757
;; But this not work with ClojureScript.
@@ -65,9 +65,9 @@
6565
[require-clause if-body else-body]
6666
(if
6767
(try
68-
(require require-clause)
68+
(requiring-resolve require-clause)
6969
true
7070
(catch Exception _
7171
false))
72-
if-body
73-
else-body)))
72+
if-body
73+
else-body)))

0 commit comments

Comments
 (0)