diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index e6a48cfa2..e83dbc16e 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -6,6 +6,7 @@ - Add implementation for the VM Service's `getFlagList` API. - [#2438](https://github.com/dart-lang/webdev/pull/2438) - Hide more variables from the local scope when debugging. These variables were synthetically added by the compiler to support late local variables and don't appear in the original source code. - [#2445](https://github.com/dart-lang/webdev/pull/2445) +- Require Dart `^3.4` ## 24.0.0 diff --git a/dwds/lib/src/debugging/inspector.dart b/dwds/lib/src/debugging/inspector.dart index 588051396..b167ee06d 100644 --- a/dwds/lib/src/debugging/inspector.dart +++ b/dwds/lib/src/debugging/inspector.dart @@ -5,7 +5,6 @@ import 'dart:math' as math; import 'package:async/async.dart'; -import 'package:collection/collection.dart'; import 'package:dwds/src/config/tool_configuration.dart'; import 'package:dwds/src/connections/app_connection.dart'; import 'package:dwds/src/debugging/classes.dart'; @@ -113,9 +112,9 @@ class AppInspector implements AppInspectorInterface { final scripts = await scriptRefs; await DartUri.initialize(); - DartUri.recordAbsoluteUris(libraries.map((lib) => lib.uri).whereNotNull()); + DartUri.recordAbsoluteUris(libraries.map((lib) => lib.uri).nonNulls); DartUri.recordAbsoluteUris( - scripts.map((script) => script.uri).whereNotNull(), + scripts.map((script) => script.uri).nonNulls, ); isolate.extensionRPCs?.addAll(await _getExtensionRpcs()); diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index ec5e9d8ac..d0c4473cc 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -6,7 +6,7 @@ description: >- service protocol. repository: https://github.com/dart-lang/webdev/tree/master/dwds environment: - sdk: ^3.2.0-36.0.dev + sdk: ^3.4.0 dependencies: async: ^2.9.0 @@ -15,46 +15,46 @@ dependencies: collection: ^1.15.0 crypto: ^3.0.2 dds: ^4.1.0 - file: ">=6.0.0 <8.0.0" - http: ^0.13.4 + file: ">=6.1.4 <8.0.0" + http: ^1.0.0 http_multi_server: ^3.2.0 logging: ^1.0.2 - meta: ^1.7.0 + meta: ^1.9.1 package_config: ^2.0.2 path: ^1.8.1 pool: ^1.5.0 pub_semver: ^2.1.1 shelf: ^1.3.0 - shelf_packages_handler: "^3.0.0" - shelf_proxy: ^1.0.1 + shelf_packages_handler: ^3.0.0 + shelf_proxy: ^1.0.4 shelf_static: ^1.1.0 - shelf_web_socket: ^1.0.1 + shelf_web_socket: '>=1.0.0 <3.0.0' source_maps: ^0.10.10 stack_trace: ^1.10.0 sse: ^4.1.2 - uuid: ^3.0.6 - vm_service: ^14.0.0 + uuid: ^4.0.0 + vm_service: ^14.2.4 vm_service_interface: 1.1.0 - web_socket_channel: ^2.2.0 + web_socket_channel: ^2.4.0 webkit_inspection_protocol: ^1.0.1 dev_dependencies: - args: ^2.3.1 - build: ^2.3.0 + args: ^2.4.2 + build: ^2.3.1 build_daemon: ^4.0.0 - build_runner: ^2.4.0 + build_runner: ^2.4.1 build_version: ^2.1.1 - build_web_compilers: ^4.0.4 - built_value_generator: ^8.3.0 + build_web_compilers: ^4.0.8 + built_value_generator: ^8.4.2 graphs: ^2.1.0 frontend_server_common: path: ../frontend_server_common - js: ^0.6.4 + js: ">=0.6.4 <0.8.0" lints: ^4.0.0 pubspec_parse: ^1.2.0 - puppeteer: ^3.0.0 - stream_channel: ^2.1.0 - test: ^1.21.1 + puppeteer: ^3.1.1 + stream_channel: ^2.1.2 + test: ^1.21.6 test_common: path: ../test_common webdriver: ^3.0.0