From 004d226a5e5caa4387bfbb38a29e88f5e02a636c Mon Sep 17 00:00:00 2001 From: Brian Quinlan Date: Thu, 11 Apr 2024 20:09:36 +0000 Subject: [PATCH] Allow package:dds and package:dtd to accept the next release of shelf_web_socket and web_socket_channel Bug:https://github.com/dart-lang/web_socket_channel/issues/340 Change-Id: I3dff79a66876005eb77a33f1f82f8ac5d19e764f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/362192 Commit-Queue: Brian Quinlan Reviewed-by: Ben Konyi Reviewed-by: Nate Bosch --- pkg/dds/CHANGELOG.md | 2 ++ pkg/dds/pubspec.yaml | 4 ++-- pkg/dtd/CHANGELOG.md | 3 +++ pkg/dtd/pubspec.yaml | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkg/dds/CHANGELOG.md b/pkg/dds/CHANGELOG.md index 71c66ccbac21..bc794ed76599 100644 --- a/pkg/dds/CHANGELOG.md +++ b/pkg/dds/CHANGELOG.md @@ -5,6 +5,8 @@ and prepared DDS for using `unified_analytics` through the Dart Tooling Daemon. - Updated `README.md` and added contributing guide (`CONTRIBUTING.md`). - Updated `package:dds_service_extensions` constraint to ^2.0.0. - Determine default `requireUserPermissionToResume` values from the `pause_isolates_on_start` and `pause_isolates_on_exit` flags. +- Indicate compatibility with `package:web_socket_channel` 2.x and 3.x +- Indicate compatibility with `package:shelf_web_socket` 1.x and 2.x - Updated the `devtools_shared` dependency to version `^9.0.1`. - Remove the `package:unified_analytics` dependency. - Serve DevTools extensions from their absolute location. diff --git a/pkg/dds/pubspec.yaml b/pkg/dds/pubspec.yaml index 43d5235eb537..78bd5a3b1a4a 100644 --- a/pkg/dds/pubspec.yaml +++ b/pkg/dds/pubspec.yaml @@ -24,13 +24,13 @@ dependencies: path: ^1.8.0 shelf_proxy: ^1.0.0 shelf_static: ^1.0.0 - shelf_web_socket: ^1.0.0 + shelf_web_socket: '>=1.0.0 <3.0.0' shelf: ^1.0.0 sse: ^4.0.0 stack_trace: ^1.10.0 stream_channel: ^2.0.0 vm_service: ^14.0.0 - web_socket_channel: ^2.0.0 + web_socket_channel: '>=2.0.0 <4.0.0' # We use 'any' version constraints here as we get our package versions from # the dart-lang/sdk repo's DEPS file. Note that this is a special case; the diff --git a/pkg/dtd/CHANGELOG.md b/pkg/dtd/CHANGELOG.md index 03b53316bd2b..eb29291aa3a3 100644 --- a/pkg/dtd/CHANGELOG.md +++ b/pkg/dtd/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.2.1 +- Indicate compatibility with `package:web_socket_channel` 2.x and 3.x. + ## 2.2.0 - Added new response types `Success`, `StringResponse`, `BoolResponse`, and `StringListResponse`. - Added contributing guide (`CONTRIBUTING.md`). diff --git a/pkg/dtd/pubspec.yaml b/pkg/dtd/pubspec.yaml index 76363b6a69bd..911fd3fd2606 100644 --- a/pkg/dtd/pubspec.yaml +++ b/pkg/dtd/pubspec.yaml @@ -1,5 +1,5 @@ name: dtd -version: 2.2.0 +version: 2.2.1 description: A package for communicating with the Dart Tooling Daemon. repository: https://github.com/dart-lang/sdk/tree/main/pkg/dtd @@ -10,7 +10,7 @@ dependencies: json_rpc_2: ^3.0.2 stream_channel: ^2.1.2 unified_analytics: ^6.0.0 - web_socket_channel: ^2.4.0 + web_socket_channel: '>=2.0.0 <4.0.0' # We use 'any' version constraints here as we get our package versions from # the dart-lang/sdk repo's DEPS file. Note that this is a special case; the