diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85eeea86c..ab40f0f29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -162,7 +162,7 @@ jobs: - juniper - juniper_subscriptions - juniper_graphql_ws - - juniper_actix + #- juniper_actix - juniper_axum - juniper_hyper - juniper_rocket @@ -171,6 +171,10 @@ jobs: - ubuntu - macOS - windows + include: + - { msrv: "1.88.0", crate: "juniper_actix", os: "ubuntu" } + - { msrv: "1.88.0", crate: "juniper_actix", os: "macOS" } + - { msrv: "1.88.0", crate: "juniper_actix", os: "windows" } runs-on: ${{ matrix.os }}-latest steps: - uses: actions/checkout@v6 diff --git a/juniper_actix/CHANGELOG.md b/juniper_actix/CHANGELOG.md index 07f548c67..148c5ba95 100644 --- a/juniper_actix/CHANGELOG.md +++ b/juniper_actix/CHANGELOG.md @@ -6,6 +6,18 @@ All user visible changes to `juniper_actix` crate will be documented in this fil +## master + +### BC Breaks + +- Switched to 0.4 version of [`actix-ws` crate]. ([#1366]) +- Bumped up [MSRV] to 1.88 due to [`actix-ws` crate] requirements. ([#1366]) + +[#1366]: /../../pull/1366 + + + + ## [0.7.0] ยท 2025-09-08 [0.7.0]: /../../tree/juniper_actix-v0.7.0/juniper_actix diff --git a/juniper_actix/Cargo.toml b/juniper_actix/Cargo.toml index 85c3ee105..c38921735 100644 --- a/juniper_actix/Cargo.toml +++ b/juniper_actix/Cargo.toml @@ -2,7 +2,7 @@ name = "juniper_actix" version = "0.7.0" edition = "2024" -rust-version = "1.85" +rust-version = "1.88" description = "`juniper` GraphQL integration with `actix-web`." license = "BSD-2-Clause" authors = [ @@ -27,11 +27,12 @@ subscriptions = [ "dep:derive_more", "dep:futures", "dep:juniper_graphql_ws", + "actix-web/ws", ] [dependencies] -actix-web = "4.4" -actix-ws = { version = "0.3", optional = true } +actix-web = { version = "4.13", default-features = false } +actix-ws = { version = "0.4", optional = true } derive_more = { version = "2.0", features = ["display", "error"], optional = true } futures = { version = "0.3.22", optional = true } juniper = { version = "0.17", path = "../juniper", default-features = false } @@ -44,6 +45,7 @@ actix-cors = "0.7" actix-http = "3.2" actix-rt = "2.0" actix-test = "0.1" +actix-web = { version = "4.13", features = ["macros"], default-features = false } anyhow = "1.0.47" async-stream = "0.3" env_logger = "0.11" diff --git a/juniper_actix/README.md b/juniper_actix/README.md index e14fc3d0f..e6507bf49 100644 --- a/juniper_actix/README.md +++ b/juniper_actix/README.md @@ -4,7 +4,7 @@ [![Crates.io](https://img.shields.io/crates/v/juniper_actix.svg?maxAge=2592000)](https://crates.io/crates/juniper_actix) [![Documentation](https://docs.rs/juniper_actix/badge.svg)](https://docs.rs/juniper_actix) [![CI](https://github.com/graphql-rust/juniper/actions/workflows/ci.yml/badge.svg?branch=master "CI")](https://github.com/graphql-rust/juniper/actions?query=workflow%3ACI+branch%3Amaster) -[![Rust 1.85+](https://img.shields.io/badge/rustc-1.85+-lightgray.svg "Rust 1.85+")](https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html) +[![Rust 1.88+](https://img.shields.io/badge/rustc-1.85+-lightgray.svg "Rust 1.88+")](https://blog.rust-lang.org/2025/06/26/Rust-1.88.0) - [Changelog](https://github.com/graphql-rust/juniper/blob/juniper_actix-v0.7.0/juniper_actix/CHANGELOG.md) diff --git a/juniper_actix/examples/subscription.rs b/juniper_actix/examples/subscription.rs index f00632061..abee9eac5 100644 --- a/juniper_actix/examples/subscription.rs +++ b/juniper_actix/examples/subscription.rs @@ -140,7 +140,6 @@ async fn main() -> std::io::Result<()> { .supports_credentials() .max_age(3600), ) - .wrap(middleware::Compress::default()) .wrap(middleware::Logger::default()) .service(web::resource("/subscriptions").route(web::get().to(subscriptions))) .service(