diff --git a/DEPS b/DEPS index 7e83e9f848d4..e4131bedb1c5 100644 --- a/DEPS +++ b/DEPS @@ -102,7 +102,7 @@ vars = { "boringssl_rev": "d24a38200fef19150eef00cad35b138936c08767", "browser-compat-data_tag": "ac8cae697014da1ff7124fba33b0b4245cc6cd1b", # v1.0.22 "cpu_features_rev": "936b9ab5515dead115606559502e3864958f7f6e", - "devtools_rev": "36e2f3edc13b9f582e04cf22e4bd00b6007b4f8c", + "devtools_rev": "ac9f4acbbe3ccc7cfd5e0278b628505f65de4428", "icu_rev": "81d656878ec611cb0b42d52c82e9dae93920d9ba", "jinja2_rev": "2222b31554f03e62600cd7e383376a7c187967a1", "libcxx_rev": "44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0", diff --git a/pkg/dds/lib/src/dds_impl.dart b/pkg/dds/lib/src/dds_impl.dart index eca84cfcb303..947adbe0a0fd 100644 --- a/pkg/dds/lib/src/dds_impl.dart +++ b/pkg/dds/lib/src/dds_impl.dart @@ -10,7 +10,7 @@ import 'dart:math'; import 'dart:typed_data'; import 'package:devtools_shared/devtools_extensions_io.dart'; -import 'package:devtools_shared/devtools_server.dart' show DTDConnectionInfo; +import 'package:devtools_shared/devtools_shared.dart' show DTDConnectionInfo; import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc; import 'package:meta/meta.dart'; import 'package:shelf/shelf.dart'; diff --git a/pkg/dds/lib/src/devtools/dtd.dart b/pkg/dds/lib/src/devtools/dtd.dart index bc0dc5d3cf7b..f70f4038d616 100644 --- a/pkg/dds/lib/src/devtools/dtd.dart +++ b/pkg/dds/lib/src/devtools/dtd.dart @@ -7,7 +7,7 @@ import 'dart:convert'; import 'dart:io'; import 'dart:isolate'; -import 'package:devtools_shared/devtools_server.dart' show DTDConnectionInfo; +import 'package:devtools_shared/devtools_shared.dart' show DTDConnectionInfo; import 'package:path/path.dart' as path; import 'utils.dart'; diff --git a/pkg/dds/lib/src/devtools/handler.dart b/pkg/dds/lib/src/devtools/handler.dart index 3e21025cfcc2..7f3cdc13cd9c 100644 --- a/pkg/dds/lib/src/devtools/handler.dart +++ b/pkg/dds/lib/src/devtools/handler.dart @@ -11,6 +11,7 @@ import 'package:devtools_shared/devtools_deeplink_io.dart'; import 'package:devtools_shared/devtools_extensions.dart'; import 'package:devtools_shared/devtools_extensions_io.dart'; import 'package:devtools_shared/devtools_server.dart' hide Handler; +import 'package:devtools_shared/devtools_shared.dart'; import 'package:mime/mime.dart'; import 'package:path/path.dart' as path; import 'package:shelf/shelf.dart'; diff --git a/pkg/dds/pubspec.yaml b/pkg/dds/pubspec.yaml index ddb15094f974..3bd3fef6b810 100644 --- a/pkg/dds/pubspec.yaml +++ b/pkg/dds/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: dds_service_extensions: ^2.0.0 dap: ^1.2.0 extension_discovery: ^2.0.0 - devtools_shared: ^9.0.1 + devtools_shared: ^10.0.0-dev.1 http_multi_server: ^3.0.0 json_rpc_2: ^3.0.0 meta: ^1.1.8 diff --git a/pkg/dds/test/dap/mocks.dart b/pkg/dds/test/dap/mocks.dart index 21e3d97d94cf..d909183cf5b9 100644 --- a/pkg/dds/test/dap/mocks.dart +++ b/pkg/dds/test/dap/mocks.dart @@ -10,7 +10,7 @@ import 'package:dds/dds.dart'; import 'package:dds/src/dap/adapters/dart_cli_adapter.dart'; import 'package:dds/src/dap/adapters/dart_test_adapter.dart'; import 'package:dds/src/dap/isolate_manager.dart'; -import 'package:devtools_shared/devtools_server.dart' show DTDConnectionInfo; +import 'package:devtools_shared/devtools_shared.dart' show DTDConnectionInfo; import 'package:vm_service/vm_service.dart'; /// A [DartCliDebugAdapter] that captures information about the process that