Merge pull request #27 from toyokumo/bump-deps

Bump deps
toyokumo · Jul 23, 2024 · 43afda8 · 43afda8
2 parents cd8fc10 + c7fe23b
commit 43afda8
Show file tree

Hide file tree

Showing 7 changed files with 223 additions and 198 deletions.
diff --git a/.clj-kondo/com.github.seancorfield/next.jdbc/config.edn b/.clj-kondo/com.github.seancorfield/next.jdbc/config.edn
@@ -0,0 +1,4 @@
+{:hooks
+ {:analyze-call
+  {next.jdbc/with-transaction
+   hooks.com.github.seancorfield.next-jdbc/with-transaction}}}
diff --git a/.clj-kondo/com.github.seancorfield/next.jdbc/hooks/com/github/seancorfield/next_jdbc.clj b/.clj-kondo/com.github.seancorfield/next.jdbc/hooks/com/github/seancorfield/next_jdbc.clj
@@ -0,0 +1,19 @@
+(ns hooks.com.github.seancorfield.next-jdbc
+  (:require
+   [clj-kondo.hooks-api :as api]))
+
+(defn with-transaction
+  "Expands (with-transaction [tx expr opts] body)
+  to (let [tx expr] opts body) pre clj-kondo examples."
+  [{:keys [:node]}]
+  (let [[binding-vec & body] (rest (:children node))
+        [sym val opts] (:children binding-vec)]
+    (when-not (and sym val)
+      (throw (ex-info "No sym and val provided" {})))
+    (let [new-node (api/list-node
+                    (list*
+                     (api/token-node 'let)
+                     (api/vector-node [sym val])
+                     opts
+                     body))]
+      {:node new-node})))
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -26,9 +26,9 @@ jobs:
           - 6379:6379
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '11'
@@ -38,14 +38,8 @@ jobs:
       - uses: DeLaGuardo/setup-clojure@master
         with:
           cli: latest
-
-      - uses: 0918nobita/[email protected]
-        with:
-          cljstyle-version: '0.15.0'
-
-      - uses: DeLaGuardo/setup-clj-kondo@master
-        with:
-          version: '2022.04.25'
+          cljstyle: latest
+          clj-kondo: latest
 
       - name: Show versions
         run: |
@@ -55,7 +49,7 @@ jobs:
           clj-kondo --version
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: clj-cache-${{ hashFiles('**/deps.edn') }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     permissions: write-all
     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: 'zulu'
           java-version: '11'
@@ -28,7 +28,7 @@ jobs:
           clojure --version
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: clj-cache-${{ hashFiles('**/deps.edn') }}

diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,7 @@ pom.xml.asc
 .idea/replstate.xml
 .idea/httpRequests
 .idea/libraries/
+.idea/git_toolbox_blame.xml
+.idea/git_toolbox_prj.xml
+
+.lsp/
diff --git a/deps.edn b/deps.edn
@@ -1,37 +1,37 @@
 {:paths ["src" "src-cljs" "src-cljc"]
- :deps {org.clojure/clojure {:mvn/version "1.11.1"}
-        org.clojure/core.async {:mvn/version "1.5.648"}
-        prismatic/schema {:mvn/version "1.2.0"}
-        camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.2"}
-        com.cognitect/transit-clj {:mvn/version "1.0.329"}
-        com.cognitect/transit-cljs {:mvn/version "0.8.269"}
-        commons-codec/commons-codec {:mvn/version "1.15"}
-        metosin/ring-http-response {:mvn/version "0.9.3" :exclusions [ring/ring-core]}
-        org.apache.commons/commons-csv {:mvn/version "1.9.0"}
-        commons-io/commons-io {:mvn/version "2.11.0"}
-        info.sunng/ring-jetty9-adapter {:mvn/version "0.17.6"}
+ :deps {org.clojure/clojure {:mvn/version "1.11.3"}
+        org.clojure/core.async {:mvn/version "1.6.681"}
+        prismatic/schema {:mvn/version "1.4.1"}
+        camel-snake-kebab/camel-snake-kebab {:mvn/version "0.4.3"}
+        com.cognitect/transit-clj {:mvn/version "1.0.333"}
+        com.cognitect/transit-cljs {:mvn/version "0.8.280"}
+        commons-codec/commons-codec {:mvn/version "1.17.1"}
+        metosin/ring-http-response {:mvn/version "0.9.4"}
+        org.apache.commons/commons-csv {:mvn/version "1.11.0"}
+        commons-io/commons-io {:mvn/version "2.16.1"}
+        info.sunng/ring-jetty9-adapter {:mvn/version "0.22.6"}
         com.stuartsierra/component {:mvn/version "1.1.0"}
-        hikari-cp/hikari-cp {:mvn/version "2.14.0" :exclusions [org.slf4j/slf4j-api]}
-        com.github.seancorfield/next.jdbc {:mvn/version "1.2.772"}
-        metosin/jsonista {:mvn/version "0.3.5"}
-        com.taoensso/carmine {:mvn/version "3.1.0"}
-        org.clojure/tools.logging {:mvn/version "1.2.4"}
-        org.eclipse.angus/angus-mail {:mvn/version "2.0.2"}
-        clj-http/clj-http {:mvn/version "3.12.3"}
-        diehard/diehard {:mvn/version "0.11.3"}}
+        hikari-cp/hikari-cp {:mvn/version "3.1.0" :exclusions [org.slf4j/slf4j-api]}
+        com.github.seancorfield/next.jdbc {:mvn/version "1.3.939"}
+        metosin/jsonista {:mvn/version "0.3.9"}
+        com.taoensso/carmine {:mvn/version "3.4.1"}
+        org.clojure/tools.logging {:mvn/version "1.3.0"}
+        org.eclipse.angus/angus-mail {:mvn/version "2.0.3"}
+        clj-http/clj-http {:mvn/version "3.13.0"}
+        diehard/diehard {:mvn/version "0.11.12"}}
  :aliases
  {:dev {:extra-paths ["test" "dev-resources"]
-        :extra-deps {org.postgresql/postgresql {:mvn/version "42.3.3"}
-                     lambdaisland/kaocha {:mvn/version "1.66.1034"}
+        :extra-deps {org.postgresql/postgresql {:mvn/version "42.7.3"}
+                     lambdaisland/kaocha {:mvn/version "1.91.1392"}
                      ;; experimental
-                     com.walmartlabs/lacinia {:mvn/version "1.2"}
-                     superlifter/superlifter {:mvn/version "0.1.3"}
-                     com.google.firebase/firebase-admin {:mvn/version "8.1.0"}}}
+                     com.walmartlabs/lacinia {:mvn/version "1.2.2"}
+                     superlifter/superlifter {:mvn/version "0.1.5"}
+                     com.google.firebase/firebase-admin {:mvn/version "9.3.0"}}}
 
   :test {:main-opts ["-m" "kaocha.runner"]}
 
   :build
-  {:deps {com.github.liquidz/build.edn {:git/tag "0.7.145" :git/sha "776501e"}}
+  {:deps {com.github.liquidz/build.edn {:git/tag "0.11.266" :git/sha "849302d"}}
    :ns-default build-edn.main}
 
   :outdated