Skip to content

Commit 6e324af

Browse files
authored
Add dependency on package:vm_service_interface (#2262)
1 parent 8429a79 commit 6e324af

24 files changed

+43
-23
lines changed

dwds/lib/src/dwds_vm_client.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import 'package:dwds/src/services/debug_service.dart';
1212
import 'package:dwds/src/utilities/synchronized.dart';
1313
import 'package:logging/logging.dart';
1414
import 'package:uuid/uuid.dart';
15-
import 'package:vm_service/vm_service.dart';
15+
import 'package:vm_service/vm_service.dart' hide VmServerConnection;
16+
import 'package:vm_service_interface/vm_service_interface.dart';
1617
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
1718

1819
final _logger = Logger('DwdsVmClient');

dwds/lib/src/services/chrome_proxy_service.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ import 'package:dwds/src/utilities/dart_uri.dart';
2727
import 'package:dwds/src/utilities/shared.dart';
2828
import 'package:logging/logging.dart' hide LogRecord;
2929
import 'package:pub_semver/pub_semver.dart' as semver;
30-
import 'package:vm_service/vm_service.dart';
30+
import 'package:vm_service/vm_service.dart'
31+
hide VmServiceInterface, vmServiceVersion;
32+
import 'package:vm_service_interface/vm_service_interface.dart';
3133
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
3234

3335
/// A proxy from the chrome debug protocol to the dart vm service protocol.

dwds/lib/src/services/debug_service.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import 'package:shelf/shelf.dart' as shelf;
2424
import 'package:shelf/shelf.dart' hide Response;
2525
import 'package:shelf_web_socket/shelf_web_socket.dart';
2626
import 'package:sse/server/sse_handler.dart';
27-
import 'package:vm_service/vm_service.dart';
27+
import 'package:vm_service_interface/vm_service_interface.dart';
2828
import 'package:web_socket_channel/web_socket_channel.dart';
2929

3030
bool _acceptNewConnections = true;

dwds/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
built_value: ^8.3.0
1515
collection: ^1.15.0
1616
crypto: ^3.0.2
17-
dds: ^2.7.1
17+
dds: ^3.0.0
1818
file: ">=6.0.0 <8.0.0"
1919
http: ^0.13.4
2020
http_multi_server: ^3.2.0
@@ -34,6 +34,7 @@ dependencies:
3434
sse: ^4.1.2
3535
uuid: ^3.0.6
3636
vm_service: ^12.0.0
37+
vm_service_interface: 1.0.0
3738
web_socket_channel: ^2.2.0
3839
webkit_inspection_protocol: ^1.0.1
3940

dwds/pubspec_overrides.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ dependency_overrides:
33
git:
44
url: https://github.com/dart-lang/sdk.git
55
path: pkg/vm_service
6+
vm_service_interface:
7+
git:
8+
url: https://github.com/dart-lang/sdk.git
9+
path: pkg/vm_service_interface

dwds/test/build_daemon_breakpoint_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
import 'package:test/test.dart';
99
import 'package:test_common/test_sdk_configuration.dart';
10-
import 'package:vm_service/vm_service.dart';
10+
import 'package:vm_service/vm_service.dart' hide VmServiceInterface;
11+
import 'package:vm_service_interface/vm_service_interface.dart';
1112

1213
import 'fixtures/context.dart';
1314
import 'fixtures/project.dart';

dwds/test/build_daemon_callstack_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
import 'package:test/test.dart';
99
import 'package:test_common/logging.dart';
1010
import 'package:test_common/test_sdk_configuration.dart';
11-
import 'package:vm_service/vm_service.dart';
11+
import 'package:vm_service/vm_service.dart' hide VmServiceInterface;
12+
import 'package:vm_service_interface/vm_service_interface.dart';
1213

1314
import 'fixtures/context.dart';
1415
import 'fixtures/project.dart';

dwds/test/chrome_proxy_service_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import 'package:path/path.dart' as path;
1818
import 'package:test/test.dart';
1919
import 'package:test_common/logging.dart';
2020
import 'package:test_common/test_sdk_configuration.dart';
21-
import 'package:vm_service/vm_service.dart';
21+
import 'package:vm_service/vm_service.dart' hide VmServiceInterface;
22+
import 'package:vm_service_interface/vm_service_interface.dart';
2223
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
2324

2425
import 'fixtures/context.dart';

dwds/test/evaluate_circular_common.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
import 'package:test/test.dart';
99
import 'package:test_common/logging.dart';
1010
import 'package:test_common/test_sdk_configuration.dart';
11-
import 'package:vm_service/vm_service.dart';
11+
import 'package:vm_service/vm_service.dart' hide VmServiceInterface;
12+
import 'package:vm_service_interface/vm_service_interface.dart';
1213

1314
import 'fixtures/context.dart';
1415
import 'fixtures/project.dart';

dwds/test/events_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import 'package:dwds/src/utilities/server.dart';
1111
import 'package:test/test.dart';
1212
import 'package:test_common/logging.dart';
1313
import 'package:test_common/test_sdk_configuration.dart';
14-
import 'package:vm_service/vm_service.dart';
14+
import 'package:vm_service/vm_service.dart' hide VmServiceInterface;
15+
import 'package:vm_service_interface/vm_service_interface.dart';
1516
import 'package:webdriver/async_core.dart';
1617

1718
import 'fixtures/context.dart';

0 commit comments

Comments
 (0)