From 1c7c9f119892fd8b6d9fd94fb3a69d3c81d80359 Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Mon, 11 Dec 2023 10:15:00 -0500 Subject: [PATCH] Defer changes in v3.3.0-wip to v4.0.0-wip --- dwds/lib/src/debugging/location.dart | 2 +- frontend_server_client/CHANGELOG.md | 8 +++----- .../lib/src/frontend_server_client.dart | 16 ++++++++-------- frontend_server_client/pubspec.yaml | 2 +- .../lib/src/frontend_server_client.dart | 2 +- test_common/lib/test_sdk_layout.dart | 7 +++++++ .../test/test_sdk_configuration_test.dart | 1 + 7 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dwds/lib/src/debugging/location.dart b/dwds/lib/src/debugging/location.dart index 26c954ed2..161573c6e 100644 --- a/dwds/lib/src/debugging/location.dart +++ b/dwds/lib/src/debugging/location.dart @@ -78,7 +78,7 @@ class DartLocation { int get hashCode => Object.hashAll([uri, line, column]); @override - bool operator ==(Object? other) { + bool operator ==(Object other) { if (other is! DartLocation) { return false; } diff --git a/frontend_server_client/CHANGELOG.md b/frontend_server_client/CHANGELOG.md index eccbcfca5..047c86e8a 100644 --- a/frontend_server_client/CHANGELOG.md +++ b/frontend_server_client/CHANGELOG.md @@ -1,14 +1,12 @@ ## 4.0.0-wip +- Update Dart SDK constraint to `^3.0.0`. +- Support changes in the SDK layout for Dart 3.0. - By default, start the frontend server from the AOT snapshot shipped in the Dart SDK. - Throw an `ArgumentError` when `FrontendServerClient.start` is called with the `frontendServerPath` argument omitted and the `debug` argument set to true. - -## 3.3.0 - -- Update Dart SDK constraint to `>=3.0.0 <4.0.0`. -- Support changes in the SDK layout for Dart 3.0. +- Update `package:vm_service` constraint to `^14.0.0`. ## 3.2.0 diff --git a/frontend_server_client/lib/src/frontend_server_client.dart b/frontend_server_client/lib/src/frontend_server_client.dart index 13fedb898..3a62274a4 100644 --- a/frontend_server_client/lib/src/frontend_server_client.dart +++ b/frontend_server_client/lib/src/frontend_server_client.dart @@ -103,10 +103,10 @@ class FrontendServerClient { feServer = await Process.start( Platform.resolvedExecutable, [ - if (debug) '--observe', - frontendServerPath, - ...commonArguments, - ], + if (debug) '--observe', + frontendServerPath, + ...commonArguments, + ], ); } else if (File(_feServerAotSnapshotPath).existsSync()) { if (debug) { @@ -123,10 +123,10 @@ class FrontendServerClient { feServer = await Process.start( Platform.resolvedExecutable, [ - if (debug) '--observe', - _feServerAppJitSnapshotPath, - ...commonArguments, - ], + if (debug) '--observe', + _feServerAppJitSnapshotPath, + ...commonArguments, + ], ); } var feServerStdoutLines = StreamQueue(feServer.stdout diff --git a/frontend_server_client/pubspec.yaml b/frontend_server_client/pubspec.yaml index 4b70bd14e..7f0657b70 100644 --- a/frontend_server_client/pubspec.yaml +++ b/frontend_server_client/pubspec.yaml @@ -20,4 +20,4 @@ dev_dependencies: test: ^1.16.0 test_descriptor: ^2.0.0 test_process: ^2.0.0 - vm_service: ^8.0.0 + vm_service: ^14.0.0 diff --git a/frontend_server_common/lib/src/frontend_server_client.dart b/frontend_server_common/lib/src/frontend_server_client.dart index aba399997..18b15b53e 100644 --- a/frontend_server_common/lib/src/frontend_server_client.dart +++ b/frontend_server_common/lib/src/frontend_server_client.dart @@ -398,7 +398,7 @@ class ResidentCompiler { _logger.info(args.join(' ')); final workingDirectory = projectDirectory.toFilePath(); - _server = await Process.start(sdkLayout.dartPath, args, + _server = await Process.start(sdkLayout.dartAotRuntimePath, args, workingDirectory: workingDirectory); var server = _server!; diff --git a/test_common/lib/test_sdk_layout.dart b/test_common/lib/test_sdk_layout.dart index 49a2c7c08..9064ce8e9 100644 --- a/test_common/lib/test_sdk_layout.dart +++ b/test_common/lib/test_sdk_layout.dart @@ -90,6 +90,11 @@ class TestSdkLayout { 'bin', Platform.isWindows ? 'dart.exe' : 'dart', ), + dartAotRuntimePath: p.join( + sdkLayout.sdkDirectory, + 'bin', + Platform.isWindows ? 'dartaotruntime.exe' : 'dartaotruntime', + ), frontendServerSnapshotPath: p.join( sdkLayout.sdkDirectory, 'bin', @@ -137,6 +142,7 @@ class TestSdkLayout { final String stackTraceMapperPath; final String dartPath; + final String dartAotRuntimePath; final String frontendServerSnapshotPath; final String dartdevcSnapshotPath; final String kernelWorkerSnapshotPath; @@ -155,6 +161,7 @@ class TestSdkLayout { required this.requireJsPath, required this.stackTraceMapperPath, required this.dartPath, + required this.dartAotRuntimePath, required this.frontendServerSnapshotPath, required this.dartdevcSnapshotPath, required this.kernelWorkerSnapshotPath, diff --git a/test_common/test/test_sdk_configuration_test.dart b/test_common/test/test_sdk_configuration_test.dart index 8a701fc45..1ff60ddee 100644 --- a/test_common/test/test_sdk_configuration_test.dart +++ b/test_common/test/test_sdk_configuration_test.dart @@ -70,6 +70,7 @@ void main() { expect(sdkLayout.stackTraceMapperPath, _fileExists); expect(sdkLayout.dartPath, _fileExists); + expect(sdkLayout.dartAotRuntimePath, _fileExists); expect(sdkLayout.frontendServerSnapshotPath, _fileExists); expect(sdkLayout.dartdevcSnapshotPath, _fileExists); expect(sdkLayout.kernelWorkerSnapshotPath, _fileExists);