From c314a028215726ad35df34f3d6adf195130b3d3a Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Thu, 31 Jul 2025 15:23:37 -0700 Subject: [PATCH 1/3] [dwds] Cleanup unused null safety related fields --- dwds/lib/src/debugging/metadata/provider.dart | 9 -------- .../lib/src/services/expression_compiler.dart | 4 ---- dwds/lib/src/utilities/sdk_configuration.dart | 22 ------------------- dwds/test/sdk_configuration_test.dart | 2 +- 4 files changed, 1 insertion(+), 36 deletions(-) diff --git a/dwds/lib/src/debugging/metadata/provider.dart b/dwds/lib/src/debugging/metadata/provider.dart index 86fb5e730..e86a81216 100644 --- a/dwds/lib/src/debugging/metadata/provider.dart +++ b/dwds/lib/src/debugging/metadata/provider.dart @@ -67,15 +67,6 @@ class MetadataProvider { MetadataProvider(this.entrypoint, this._assetReader); - /// A sound null safety mode for the whole app. - /// - /// All libraries have to agree on null safety mode. - @Deprecated('Only sound null safety is supported as of Dart 3.0') - Future get soundNullSafety async { - await _initialize(); - return true; - } - /// A list of all libraries in the Dart application. /// /// Example: diff --git a/dwds/lib/src/services/expression_compiler.dart b/dwds/lib/src/services/expression_compiler.dart index 9a2526d76..175a5b857 100644 --- a/dwds/lib/src/services/expression_compiler.dart +++ b/dwds/lib/src/services/expression_compiler.dart @@ -6,15 +6,11 @@ class CompilerOptions { final ModuleFormat moduleFormat; - @Deprecated('Only sound null safety is supported as of Dart 3.0') - final bool soundNullSafety; - final bool canaryFeatures; final List experiments; CompilerOptions({ required this.moduleFormat, - this.soundNullSafety = true, required this.canaryFeatures, required this.experiments, }); diff --git a/dwds/lib/src/utilities/sdk_configuration.dart b/dwds/lib/src/utilities/sdk_configuration.dart index 9f3657b1f..ead1769d3 100644 --- a/dwds/lib/src/utilities/sdk_configuration.dart +++ b/dwds/lib/src/utilities/sdk_configuration.dart @@ -47,12 +47,6 @@ class SdkLayout { final String summaryPath; final String dartdevcSnapshotPath; - @Deprecated('Only sound null safety is supported as of Dart 3.0') - final String soundSummaryPath; - - @Deprecated('Only sound null safety is supported as of Dart 3.0') - final String weakSummaryPath; - SdkLayout.createDefault(String sdkDirectory) : this( sdkDirectory: sdkDirectory, @@ -73,8 +67,6 @@ class SdkLayout { const SdkLayout({ required this.sdkDirectory, required this.summaryPath, - this.soundSummaryPath = '', - this.weakSummaryPath = '', required this.dartdevcSnapshotPath, }); } @@ -93,17 +85,9 @@ class SdkConfiguration { final String? sdkSummaryPath; final String? compilerWorkerPath; - @Deprecated('Only sound null safety is supported as of Dart 3.0') - final String? weakSdkSummaryPath; - - @Deprecated('Only sound null safety is supported as of Dart 3.0') - final String? soundSdkSummaryPath; - const SdkConfiguration({ this.sdkDirectory, this.sdkSummaryPath, - this.weakSdkSummaryPath, - this.soundSdkSummaryPath, this.compilerWorkerPath, }); @@ -123,12 +107,6 @@ class SdkConfiguration { Uri? get sdkDirectoryUri => _toUri(sdkDirectory); Uri? get sdkSummaryUri => _toUri(sdkSummaryPath); - @Deprecated('Only sound null safety is supported as of Dart 3.0') - Uri? get soundSdkSummaryUri => _toUri(soundSdkSummaryPath); - - @Deprecated('Only sound null safety is supported as of Dart 3.0') - Uri? get weakSdkSummaryUri => _toUri(weakSdkSummaryPath); - /// Note: has to be ///file: Uri to run in an isolate. Uri? get compilerWorkerUri => _toAbsoluteUri(compilerWorkerPath); diff --git a/dwds/test/sdk_configuration_test.dart b/dwds/test/sdk_configuration_test.dart index e8e77dd08..bf2901dab 100644 --- a/dwds/test/sdk_configuration_test.dart +++ b/dwds/test/sdk_configuration_test.dart @@ -143,7 +143,7 @@ class FakeSdkLayout { FakeSdkLayout(this.sdkDirectory); - String get summaryPath => p.join(sdkDirectory, 'summaries', 'sound.dill'); + String get summaryPath => p.join(sdkDirectory, 'summaries', 'outline.dill'); String get compilerWorkerPath => p.join(sdkDirectory, 'snapshots', 'test.snapshot'); From de7981166a7294ddbea9d557cb4d87878577889d Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Fri, 1 Aug 2025 09:36:15 -0700 Subject: [PATCH 2/3] stop passing sound-null-safety --- dwds/lib/src/services/expression_compiler_service.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/dwds/lib/src/services/expression_compiler_service.dart b/dwds/lib/src/services/expression_compiler_service.dart index dfb54be95..5b690f2a1 100644 --- a/dwds/lib/src/services/expression_compiler_service.dart +++ b/dwds/lib/src/services/expression_compiler_service.dart @@ -78,7 +78,6 @@ class _Compiler { '--module-format', compilerOptions.moduleFormat.name, if (verbose) '--verbose', - '--sound-null-safety', for (final experiment in compilerOptions.experiments) '--enable-experiment=$experiment', if (compilerOptions.canaryFeatures) '--canary', From fb3e8a3a257caf1007111956fddf9f24aa825ab5 Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Tue, 5 Aug 2025 16:26:02 -0700 Subject: [PATCH 3/3] bump major version and remove deprecated parameter --- dwds/CHANGELOG.md | 6 +++++- dwds/lib/dart_web_debug_service.dart | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index abff4fdf2..999a803c9 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,6 +1,10 @@ -## 24.4.2-wip +## 25.0.0-wip - Update a call to the `package:shelf_web_socket` `webSocketHandler()` function. +- Remove deprecated parameter `injectDebuggingSupportCode` from `Dwds.start()`. +- Remove all deprecated fields, getters, and parameters + related to the null safety compilation mode. Dart 3 only + supports [sound null safety](https://dart.dev/null-safety). ## 24.4.1 diff --git a/dwds/lib/dart_web_debug_service.dart b/dwds/lib/dart_web_debug_service.dart index 587e8af43..693bcd8ce 100644 --- a/dwds/lib/dart_web_debug_service.dart +++ b/dwds/lib/dart_web_debug_service.dart @@ -74,11 +74,6 @@ class Dwds { required Stream buildResults, required ConnectionProvider chromeConnection, required ToolConfiguration toolConfiguration, - // ignore: avoid-unused-parameters - @Deprecated( - 'This parameter is ignored and will be removed in a future version.', - ) - bool injectDebuggingSupportCode = true, bool useDwdsWebSocketConnection = false, }) async { globalToolConfiguration = toolConfiguration;