Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reset webdev, dwds, test_common after publishing #2048

Merged
merged 12 commits into from
Mar 23, 2023
Merged

Reset webdev, dwds, test_common after publishing #2048

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9d2c1c7
Reset webdev, dwds, test_common after publishing
elliette Mar 22, 2023
bab2f80
New line
elliette Mar 22, 2023
454b411
Update DWDS version
elliette Mar 22, 2023
44af7d5
Switch to using pubspec_overrides
elliette Mar 22, 2023
accb9ca
Clean up
elliette Mar 22, 2023
b648ee7
Build dwds and webdev
elliette Mar 22, 2023
5103f64
Remove new lines
elliette Mar 22, 2023
e3f1f44
Add new lines back
elliette Mar 22, 2023
c8d4030
More missing new lines
elliette Mar 22, 2023
c931084
Respond to PR comments
elliette Mar 23, 2023
c56462e
Add pubspec_overrides back for frontend_server_common
elliette Mar 23, 2023
a76e216
PR comments
elliette Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dwds/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
6 changes: 0 additions & 6 deletions dwds/debug_extension/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ..
5 changes: 5 additions & 0 deletions dwds/debug_extension/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependency_overrides:
webdev:
path: ../../webdev
dwds:
path: ..
3 changes: 3 additions & 0 deletions dwds/debug_extension_mv3/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
dwds:
path: ..
2 changes: 1 addition & 1 deletion dwds/lib/src/version.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dwds/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
5 changes: 0 additions & 5 deletions frontend_server_client/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,3 @@ dev_dependencies:
test_descriptor: ^2.0.0
test_process: ^2.0.0
vm_service: ^8.0.0

dependency_overrides:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this break on release of frontent_server_client if the condition in the comment is not met yet?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm I think this can now be removed, I see dart-lang/test#1753 and #1762 (comment) both indicating that. @jakemac53 to confirm

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, thanks!

# Necessary to get a version solve until test_core allows version 3.x of
# this package
test_core: ^0.4.13
4 changes: 0 additions & 4 deletions frontend_server_common/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,3 @@ dependencies:
test_common:
path: ../test_common
usage: ^4.0.0

dependency_overrides:
dwds:
path: ../dwds
3 changes: 3 additions & 0 deletions frontend_server_common/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file needed? Looks like we already import local dwds in the pubspec file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, deleted this file!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, with this removed I see:

Because every version of test_common from path depends on dwds from hosted and frontend_server_common depends on dwds from path, test_common from path is forbidden.
So, because frontend_server_common depends on test_common from path, version solving failed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's strange:) Some weirdness of the constraint solver I guess. We can also try "any" for dwds in the pubspec (since this package is never published an its users already have their constraints for dwds I think it will work), or bring the pubspec_overrides back, if you you prefer.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I think we just can follow what you did for test_common - change the pubspec one to "any" and keep the pubspec_overrides?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done!

dwds:
path: ../dwds
7 changes: 1 addition & 6 deletions test_common/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,11 @@ 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
test: ^1.21.1

dev_dependencies:
lints: ^2.0.0

# Comment out before releasing webdev.
# dependency_overrides:
# dwds:
# path: ../dwds
3 changes: 3 additions & 0 deletions test_common/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
dwds:
path: ../dwds
2 changes: 2 additions & 0 deletions webdev/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## 3.0.4-dev

## 3.0.3

- Update `dwds` constraint to `18.0.2`.
Expand Down
2 changes: 1 addition & 1 deletion webdev/lib/src/version.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions webdev/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: >-
Expand Down Expand Up @@ -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:
3 changes: 3 additions & 0 deletions webdev/pubspec_overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dependency_overrides:
dwds:
path: ../dwds