Google Git Google Git
Sign in
dart/webdev/25f17cda837042e8b4f7aec5192c68bef0d3c387^!/.
commit
25f17cda837042e8b4f7aec5192c68bef0d3c387
[log]
author
Ben Konyi <bkonyi@google.com>
Wed Oct 25 15:34:01 2023 -0400
committer
GitHub <noreply@github.com>
Wed Oct 25 15:34:01 2023 -0400
tree
0567224c9c6e2b20b72ec816958db1d944aa3cc8
parent
6e324afb1802ce25428c72871beb9c8faa19d036 [diff] 
Roll package:vm_service to 13.0.0 (#2265)


diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
index 015fe8e..10c4d6c 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 3125dd2..c1ebeab 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/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 bbe50d3..69f5e76 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/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 ea67667..e212333 100644
--- a/dwds/pubspec.yaml
+++ b/dwds/pubspec.yaml

@@ -33,7 +33,7 @@
   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 1827c55..2bd0bda 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 fe96912..0af7fcd 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 4c222ca..b7ac415 100644
--- a/dwds/test/chrome_proxy_service_test.dart
+++ b/dwds/test/chrome_proxy_service_test.dart

@@ -18,7 +18,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 '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 0aed5b6..869a7d3 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 3a37fc2..714578b 100644
--- a/dwds/test/events_test.dart
+++ b/dwds/test/events_test.dart

@@ -11,7 +11,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 'package:webdriver/async_core.dart';
 

diff --git a/dwds/test/frontend_server_breakpoint_test.dart b/dwds/test/frontend_server_breakpoint_test.dart
index c835f77..240b4fb 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 f97fa16..6655571 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 1b98062..6cc1e38 100644
--- a/dwds/test/refresh_test.dart
+++ b/dwds/test/refresh_test.dart

@@ -12,7 +12,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/restore_breakpoints_test.dart b/dwds/test/restore_breakpoints_test.dart
index 44e44cb..5070c47 100644
--- a/dwds/test/restore_breakpoints_test.dart
+++ b/dwds/test/restore_breakpoints_test.dart

@@ -9,7 +9,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/run_request_test.dart b/dwds/test/run_request_test.dart
index 8b49e85..19e2d25 100644
--- a/dwds/test/run_request_test.dart
+++ b/dwds/test/run_request_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/webdev/CHANGELOG.md b/webdev/CHANGELOG.md
index a2a160d..3d3e74a 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 569a5de..259deb6 100644
--- a/webdev/pubspec.yaml
+++ b/webdev/pubspec.yaml

@@ -34,7 +34,7 @@
   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