Merge branch 'dart-lang:master' into master

dart-lang · Aug 19, 2023 · 4666325 · 4666325
2 parents 0dc0641 + fc876cb
commit 4666325
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 8 deletions.
diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 20.0.2-wip
+
 ## 20.0.1
 
 - Update file dependency to `>=6.0.0 < 8.0.0` - [#123260](https://github.com/flutter/flutter/pull/123260#issuecomment-1674001623).

diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart
diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 20.0.1
+version: 20.0.2-wip
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
   service protocol.

diff --git a/dwds/ignore_pubspec_overrides.yaml → dwds/pubspec_overrides.yaml b/dwds/ignore_pubspec_overrides.yaml → dwds/pubspec_overrides.yaml
diff --git a/frontend_server_common/pubspec.yaml b/frontend_server_common/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
 
 dependencies:
   dwds: any
-  file: ^7.0.0
+  file: ">=6.0.0 <8.0.0"
   logging: ^1.0.1
   meta: ^1.4.0
   mime: ^1.0.0

diff --git a/test_common/pubspec.yaml b/test_common/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
 
 dependencies:
   dwds: any
-  file: ^7.0.0
+  file: ">=6.0.0 <8.0.0"
   logging: ^1.0.1
   path: ^1.8.1
   test: ^1.21.1

diff --git a/webdev/CHANGELOG.md b/webdev/CHANGELOG.md
@@ -1,7 +1,10 @@
-## 3.0.7-wip
+## 3.0.8-wip
+
+## 3.0.7
 
 - Update `build_web_compilers` constraint to `^4.0.4`.
 - Update SDK constraint to `>=3.1.0-340.0.dev <4.0.0`.
+- Update `dwds` constraint to `20.0.1`.
 
 ## 3.0.6
 

diff --git a/webdev/lib/src/version.dart b/webdev/lib/src/version.dart
diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webdev
 # Every time this changes you need to run `dart run build_runner build`.
-version: 3.0.7-wip
+version: 3.0.8-wip
 # We should not depend on a dev SDK before publishing.
 # publish_to: none
 description: >-
@@ -19,7 +19,7 @@ dependencies:
   crypto: ^3.0.2
   dds: ^2.2.0
   # Pin DWDS to avoid dependency conflicts with vm_service:
-  dwds: 19.0.2
+  dwds: 20.0.1
   http: ^0.13.4
   http_multi_server: ^3.2.0
   io: ^1.0.3