From afee8c7448fb151d9a526f4bf42b0e8270c03f50 Mon Sep 17 00:00:00 2001 From: "Elliott Brooks (she/her)" <21270878+elliette@users.noreply.github.com> Date: Thu, 23 Mar 2023 12:31:54 -0700 Subject: [PATCH] Reset `webdev`, `dwds`, `test_common` after publishing (#2048) --- dwds/CHANGELOG.md | 2 ++ dwds/debug_extension/pubspec.yaml | 6 ------ dwds/debug_extension/pubspec_overrides.yaml | 5 +++++ dwds/debug_extension_mv3/pubspec_overrides.yaml | 3 +++ dwds/lib/src/version.dart | 2 +- dwds/pubspec.yaml | 2 +- frontend_server_client/pubspec.yaml | 5 ----- frontend_server_common/pubspec.yaml | 7 +------ frontend_server_common/pubspec_overrides.yaml | 3 +++ test_common/pubspec.yaml | 7 +------ test_common/pubspec_overrides.yaml | 3 +++ webdev/CHANGELOG.md | 2 ++ webdev/lib/src/version.dart | 2 +- webdev/pubspec.yaml | 7 +------ webdev/pubspec_overrides.yaml | 3 +++ 15 files changed, 27 insertions(+), 32 deletions(-) create mode 100644 dwds/debug_extension/pubspec_overrides.yaml create mode 100644 dwds/debug_extension_mv3/pubspec_overrides.yaml create mode 100644 frontend_server_common/pubspec_overrides.yaml create mode 100644 test_common/pubspec_overrides.yaml create mode 100644 webdev/pubspec_overrides.yaml diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index adc11006a..284397194 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,3 +1,5 @@ +## 18.0.3-dev + ## 18.0.2 - Support new DDC temp names for patterns. - [#2042](https://github.com/dart-lang/webdev/pull/2042) diff --git a/dwds/debug_extension/pubspec.yaml b/dwds/debug_extension/pubspec.yaml index 82584e699..9a3ecdf6a 100644 --- a/dwds/debug_extension/pubspec.yaml +++ b/dwds/debug_extension/pubspec.yaml @@ -23,9 +23,3 @@ dev_dependencies: built_collection: ^5.0.0 dwds: ^11.0.0 webdev: ^2.0.0 - -dependency_overrides: - webdev: - path: ../../webdev - dwds: - path: .. diff --git a/dwds/debug_extension/pubspec_overrides.yaml b/dwds/debug_extension/pubspec_overrides.yaml new file mode 100644 index 000000000..4da474653 --- /dev/null +++ b/dwds/debug_extension/pubspec_overrides.yaml @@ -0,0 +1,5 @@ +dependency_overrides: + webdev: + path: ../../webdev + dwds: + path: .. diff --git a/dwds/debug_extension_mv3/pubspec_overrides.yaml b/dwds/debug_extension_mv3/pubspec_overrides.yaml new file mode 100644 index 000000000..581552eac --- /dev/null +++ b/dwds/debug_extension_mv3/pubspec_overrides.yaml @@ -0,0 +1,3 @@ +dependency_overrides: + dwds: + path: .. diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart index a172ee8a6..b14bea8ec 100644 --- a/dwds/lib/src/version.dart +++ b/dwds/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '18.0.2'; +const packageVersion = '18.0.3-dev'; diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index 49d3b32bf..ddb86c63a 100644 --- 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: 18.0.2 +version: 18.0.3-dev description: >- A service that proxies between the Chrome debug protocol and the Dart VM service protocol. diff --git a/frontend_server_client/pubspec.yaml b/frontend_server_client/pubspec.yaml index 5043270ae..e1507b406 100644 --- a/frontend_server_client/pubspec.yaml +++ b/frontend_server_client/pubspec.yaml @@ -21,8 +21,3 @@ dev_dependencies: test_descriptor: ^2.0.0 test_process: ^2.0.0 vm_service: ^8.0.0 - -dependency_overrides: - # Necessary to get a version solve until test_core allows version 3.x of - # this package - test_core: ^0.4.13 diff --git a/frontend_server_common/pubspec.yaml b/frontend_server_common/pubspec.yaml index d1646b17f..b10c64e1d 100644 --- a/frontend_server_common/pubspec.yaml +++ b/frontend_server_common/pubspec.yaml @@ -6,8 +6,7 @@ environment: sdk: ">=3.0.0-134.0.dev <4.0.0" dependencies: - dwds: - path: ../dwds + dwds: any file: ^6.1.3 logging: ^1.0.1 meta: ^1.4.0 @@ -19,7 +18,3 @@ dependencies: test_common: path: ../test_common usage: ^4.0.0 - -dependency_overrides: - dwds: - path: ../dwds diff --git a/frontend_server_common/pubspec_overrides.yaml b/frontend_server_common/pubspec_overrides.yaml new file mode 100644 index 000000000..d3d78b8af --- /dev/null +++ b/frontend_server_common/pubspec_overrides.yaml @@ -0,0 +1,3 @@ +dependency_overrides: + dwds: + path: ../dwds diff --git a/test_common/pubspec.yaml b/test_common/pubspec.yaml index 83c8f0b3b..1858994a3 100644 --- a/test_common/pubspec.yaml +++ b/test_common/pubspec.yaml @@ -6,7 +6,7 @@ environment: sdk: ">=3.0.0-134.0.dev <4.0.0" dependencies: - dwds: 18.0.2 + dwds: any file: ^6.1.3 logging: ^1.0.1 path: ^1.8.1 @@ -14,8 +14,3 @@ dependencies: dev_dependencies: lints: ^2.0.0 - -# Comment out before releasing webdev. -# dependency_overrides: -# dwds: -# path: ../dwds diff --git a/test_common/pubspec_overrides.yaml b/test_common/pubspec_overrides.yaml new file mode 100644 index 000000000..d3d78b8af --- /dev/null +++ b/test_common/pubspec_overrides.yaml @@ -0,0 +1,3 @@ +dependency_overrides: + dwds: + path: ../dwds diff --git a/webdev/CHANGELOG.md b/webdev/CHANGELOG.md index 5c021f0a3..6fe4831be 100644 --- a/webdev/CHANGELOG.md +++ b/webdev/CHANGELOG.md @@ -1,3 +1,5 @@ +## 3.0.4-dev + ## 3.0.3 - Update `dwds` constraint to `18.0.2`. diff --git a/webdev/lib/src/version.dart b/webdev/lib/src/version.dart index 70c1796cf..5e6c6096e 100644 --- a/webdev/lib/src/version.dart +++ b/webdev/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '3.0.3'; +const packageVersion = '3.0.4-dev'; diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml index c760a4727..69ac1dddc 100644 --- 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.3 +version: 3.0.4-dev # We should not depend on a dev SDK before publishing. # publish_to: none description: >- @@ -51,10 +51,5 @@ dev_dependencies: test_process: ^2.0.2 webdriver: ^3.0.0 -# Comment out before releasing webdev. -# dependency_overrides: -# dwds: -# path: ../dwds - executables: webdev: diff --git a/webdev/pubspec_overrides.yaml b/webdev/pubspec_overrides.yaml new file mode 100644 index 000000000..d3d78b8af --- /dev/null +++ b/webdev/pubspec_overrides.yaml @@ -0,0 +1,3 @@ +dependency_overrides: + dwds: + path: ../dwds