From 660b6c499979b5540f4149672cde07acb0954dc7 Mon Sep 17 00:00:00 2001 From: "Howard M. Lewis Ship" Date: Fri, 12 Jul 2024 15:09:04 -0700 Subject: [PATCH] Bump dependencies, pedestal 0.7.0 --- .github/workflows/config.yml | 2 +- CHANGELOG.md | 2 +- deps.edn | 15 +++++++-------- dev-resources/logback.xml | 3 ++- dev-resources/user.clj | 1 + .../lacinia/pedestal/subscriptions.clj | 10 ++++++---- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 3c65bdb..b21edbe 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 - name: Setup Java uses: actions/setup-java@v4.2.1 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d64239..a5c291c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ hasn't changed. Other changes: * Bumped many dependencies to latest -* Bumped Pedestal dependency to 0.7.0-beta-1 +* Bumped Pedestal dependency to 0.7.0 ## 1.2 -- 23 Jun 2023 diff --git a/deps.edn b/deps.edn index 4595132..c9a180d 100644 --- a/deps.edn +++ b/deps.edn @@ -1,10 +1,8 @@ {:deps {org.clojure/clojure {:mvn/version "1.11.3"} com.walmartlabs/lacinia {:mvn/version "1.2.2"} - com.fasterxml.jackson.core/jackson-core {:mvn/version "2.17.1"} - io.pedestal/pedestal.service - {:local/root "../pedestal/service"} - #_{:mvn/version "0.7.0-beta-1"} - io.pedestal/pedestal.jetty {:mvn/version "0.7.0-beta-1"} + com.fasterxml.jackson.core/jackson-core {:mvn/version "2.17.2"} + io.pedestal/pedestal.service {:mvn/version "0.7.0"} + io.pedestal/pedestal.jetty {:mvn/version "0.7.0"} com.rpl/proxy-plus {:mvn/version "0.0.11"}} :mvn/repos {"redplanetlabs" {:url "https://nexus.redplanetlabs.com/repository/maven-public-releases"}} :paths ["src" "resources"] @@ -17,10 +15,11 @@ com.walmartlabs/test-reporting {:mvn/version "1.2"} com.stuartsierra/component {:mvn/version "1.1.0"} expound/expound {:mvn/version "0.9.0"} - hato/hato {:mvn/version "0.9.0"} + hato/hato {:mvn/version "1.0.0"} + nubank/matcher-combinators {:mvn/version "3.9.1"} io.github.hlship/trace {:mvn/version "1.3"} - org.clj-commons/pretty {:mvn/version "2.6.0"} - io.github.tonsky/clj-reload {:mvn/version "0.5.0"} + org.clj-commons/pretty {:mvn/version "3.0.0"} + io.github.tonsky/clj-reload {:mvn/version "0.7.1"} ch.qos.logback/logback-classic {:mvn/version "1.5.6"}} :jvm-opts ["-Xmx500m"] diff --git a/dev-resources/logback.xml b/dev-resources/logback.xml index 10d264c..869292c 100644 --- a/dev-resources/logback.xml +++ b/dev-resources/logback.xml @@ -17,8 +17,9 @@ - + + diff --git a/dev-resources/user.clj b/dev-resources/user.clj index a625ff9..235e3fc 100644 --- a/dev-resources/user.clj +++ b/dev-resources/user.clj @@ -4,6 +4,7 @@ [clojure.spec.alpha :as s] [net.lewisship.trace :as trace] [clj-commons.pretty.repl :as repl] + matcher-combinators.test [expound.alpha :as expound])) (s/check-asserts true) diff --git a/src/com/walmartlabs/lacinia/pedestal/subscriptions.clj b/src/com/walmartlabs/lacinia/pedestal/subscriptions.clj index 419e898..f013e37 100644 --- a/src/com/walmartlabs/lacinia/pedestal/subscriptions.clj +++ b/src/com/walmartlabs/lacinia/pedestal/subscriptions.clj @@ -551,11 +551,13 @@ (log/trace :event ::connected :id session-id) (when session-initializer (session-initializer session config))) - response-data-ch (response-chan-fn) ; server data -> client + ; server data -> client + response-data-ch (response-chan-fn) send-ch (ws/start-ws-connection session {:send-buffer-or-n send-buffer-or-n}) - ws-text-ch (chan 1) ; client text -> server - ws-data-ch (chan 10) ; client text -> client data - ] + ; client text -> server + ws-text-ch (chan 1) + ; client text -> client data + ws-data-ch (chan 10)] (response-encode-loop response-data-ch send-ch) (ws-parse-loop session-id ws-text-ch ws-data-ch response-data-ch) (connection-loop session-id keep-alive-ms ws-data-ch response-data-ch base-context)