diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 015fe8e82..10c4d6c3e 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,4 +1,5 @@ ## 22.1.0-wip +- Update `package:vm_service` constraint to `^13.0.0`. - [#2235](https://github.com/dart-lang/webdev/pull/2265) ## 22.0.0 diff --git a/dwds/lib/src/dwds_vm_client.dart b/dwds/lib/src/dwds_vm_client.dart index 3125dd2f1..c1ebeab60 100644 --- a/dwds/lib/src/dwds_vm_client.dart +++ b/dwds/lib/src/dwds_vm_client.dart @@ -12,7 +12,7 @@ import 'package:dwds/src/services/debug_service.dart'; import 'package:dwds/src/utilities/synchronized.dart'; import 'package:logging/logging.dart'; import 'package:uuid/uuid.dart'; -import 'package:vm_service/vm_service.dart' hide VmServerConnection; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart'; diff --git a/dwds/lib/src/services/chrome_proxy_service.dart b/dwds/lib/src/services/chrome_proxy_service.dart index bbe50d3a7..69f5e76b0 100644 --- a/dwds/lib/src/services/chrome_proxy_service.dart +++ b/dwds/lib/src/services/chrome_proxy_service.dart @@ -27,8 +27,7 @@ import 'package:dwds/src/utilities/dart_uri.dart'; import 'package:dwds/src/utilities/shared.dart'; import 'package:logging/logging.dart' hide LogRecord; import 'package:pub_semver/pub_semver.dart' as semver; -import 'package:vm_service/vm_service.dart' - hide VmServiceInterface, vmServiceVersion; +import 'package:vm_service/vm_service.dart' hide vmServiceVersion; import 'package:vm_service_interface/vm_service_interface.dart'; import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart'; diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index ea67667e5..e212333b8 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -33,7 +33,7 @@ dependencies: stack_trace: ^1.10.0 sse: ^4.1.2 uuid: ^3.0.6 - vm_service: ^12.0.0 + vm_service: ^13.0.0 vm_service_interface: 1.0.0 web_socket_channel: ^2.2.0 webkit_inspection_protocol: ^1.0.1 diff --git a/dwds/test/build_daemon_breakpoint_test.dart b/dwds/test/build_daemon_breakpoint_test.dart index 1827c5520..2bd0bda59 100644 --- a/dwds/test/build_daemon_breakpoint_test.dart +++ b/dwds/test/build_daemon_breakpoint_test.dart @@ -7,7 +7,7 @@ import 'package:test/test.dart'; import 'package:test_common/test_sdk_configuration.dart'; -import 'package:vm_service/vm_service.dart' hide VmServiceInterface; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'fixtures/context.dart'; diff --git a/dwds/test/build_daemon_callstack_test.dart b/dwds/test/build_daemon_callstack_test.dart index fe969125e..0af7fcd96 100644 --- a/dwds/test/build_daemon_callstack_test.dart +++ b/dwds/test/build_daemon_callstack_test.dart @@ -8,7 +8,7 @@ import 'package:test/test.dart'; import 'package:test_common/logging.dart'; import 'package:test_common/test_sdk_configuration.dart'; -import 'package:vm_service/vm_service.dart' hide VmServiceInterface; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'fixtures/context.dart'; diff --git a/dwds/test/chrome_proxy_service_test.dart b/dwds/test/chrome_proxy_service_test.dart index 4c222ca74..b7ac4152b 100644 --- a/dwds/test/chrome_proxy_service_test.dart +++ b/dwds/test/chrome_proxy_service_test.dart @@ -18,7 +18,7 @@ import 'package:path/path.dart' as path; import 'package:test/test.dart'; import 'package:test_common/logging.dart'; import 'package:test_common/test_sdk_configuration.dart'; -import 'package:vm_service/vm_service.dart' hide VmServiceInterface; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart'; diff --git a/dwds/test/evaluate_circular_common.dart b/dwds/test/evaluate_circular_common.dart index 0aed5b6f0..869a7d30d 100644 --- a/dwds/test/evaluate_circular_common.dart +++ b/dwds/test/evaluate_circular_common.dart @@ -8,7 +8,7 @@ import 'package:test/test.dart'; import 'package:test_common/logging.dart'; import 'package:test_common/test_sdk_configuration.dart'; -import 'package:vm_service/vm_service.dart' hide VmServiceInterface; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'fixtures/context.dart'; diff --git a/dwds/test/events_test.dart b/dwds/test/events_test.dart index 3a37fc27b..714578b16 100644 --- a/dwds/test/events_test.dart +++ b/dwds/test/events_test.dart @@ -11,7 +11,7 @@ import 'package:dwds/src/utilities/server.dart'; import 'package:test/test.dart'; import 'package:test_common/logging.dart'; import 'package:test_common/test_sdk_configuration.dart'; -import 'package:vm_service/vm_service.dart' hide VmServiceInterface; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'package:webdriver/async_core.dart'; diff --git a/dwds/test/frontend_server_breakpoint_test.dart b/dwds/test/frontend_server_breakpoint_test.dart index c835f7798..240b4fb0a 100644 --- a/dwds/test/frontend_server_breakpoint_test.dart +++ b/dwds/test/frontend_server_breakpoint_test.dart @@ -8,7 +8,7 @@ import 'package:test/test.dart'; import 'package:test_common/logging.dart'; import 'package:test_common/test_sdk_configuration.dart'; -import 'package:vm_service/vm_service.dart' hide VmServiceInterface; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'fixtures/context.dart'; diff --git a/dwds/test/frontend_server_callstack_test.dart b/dwds/test/frontend_server_callstack_test.dart index f97fa16cd..665557116 100644 --- a/dwds/test/frontend_server_callstack_test.dart +++ b/dwds/test/frontend_server_callstack_test.dart @@ -8,7 +8,7 @@ import 'package:test/test.dart'; import 'package:test_common/logging.dart'; import 'package:test_common/test_sdk_configuration.dart'; -import 'package:vm_service/vm_service.dart' hide VmServiceInterface; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'fixtures/context.dart'; diff --git a/dwds/test/refresh_test.dart b/dwds/test/refresh_test.dart index 1b9806202..6cc1e3887 100644 --- a/dwds/test/refresh_test.dart +++ b/dwds/test/refresh_test.dart @@ -12,7 +12,7 @@ import 'dart:async'; import 'package:test/test.dart'; import 'package:test_common/test_sdk_configuration.dart'; -import 'package:vm_service/vm_service.dart' hide VmServiceInterface; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'fixtures/context.dart'; diff --git a/dwds/test/restore_breakpoints_test.dart b/dwds/test/restore_breakpoints_test.dart index 44e44cb5c..5070c47e1 100644 --- a/dwds/test/restore_breakpoints_test.dart +++ b/dwds/test/restore_breakpoints_test.dart @@ -9,7 +9,7 @@ import 'dart:async'; import 'package:test/test.dart'; import 'package:test_common/logging.dart'; import 'package:test_common/test_sdk_configuration.dart'; -import 'package:vm_service/vm_service.dart' hide VmServiceInterface; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'fixtures/context.dart'; diff --git a/dwds/test/run_request_test.dart b/dwds/test/run_request_test.dart index 8b49e8555..19e2d2533 100644 --- a/dwds/test/run_request_test.dart +++ b/dwds/test/run_request_test.dart @@ -8,7 +8,7 @@ import 'dart:async'; import 'package:test/test.dart'; import 'package:test_common/logging.dart'; import 'package:test_common/test_sdk_configuration.dart'; -import 'package:vm_service/vm_service.dart' hide VmServiceInterface; +import 'package:vm_service/vm_service.dart'; import 'package:vm_service_interface/vm_service_interface.dart'; import 'fixtures/context.dart'; diff --git a/webdev/CHANGELOG.md b/webdev/CHANGELOG.md index a2a160dc0..3d3e74aeb 100644 --- a/webdev/CHANGELOG.md +++ b/webdev/CHANGELOG.md @@ -1,6 +1,7 @@ ## 3.2.0-wip - Add dependency on `package:vm_service_interface`. - [#2262](https://github.com/dart-lang/webdev/pull/2262) +- Update `package:vm_service` constraint to `>=10.1.0 <14.0.0`. - [#2235](https://github.com/dart-lang/webdev/pull/2265) ## 3.1.0 diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml index 569a5de80..259deb642 100644 --- a/webdev/pubspec.yaml +++ b/webdev/pubspec.yaml @@ -34,7 +34,7 @@ dependencies: shelf_static: ^1.1.0 stack_trace: ^1.10.0 sse: ^4.1.0 - vm_service: ">=10.1.0 <13.0.0" + vm_service: ">=10.1.0 <14.0.0" webkit_inspection_protocol: ^1.0.1 yaml: ^3.1.1