Bump devtools to include breaking LocalFileSystem change Change-Id: I7f2f798655d0965ad839a1108fb1a0c5869805cd Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/524224 Commit-Queue: Samuel Rawlins <srawlins@google.com> Reviewed-by: Kenzie Davisson <kenzieschmoll@google.com> Reviewed-by: Nicholas Shahan <nshahan@google.com>
diff --git a/DEPS b/DEPS index c952bed..8402d09 100644 --- a/DEPS +++ b/DEPS
@@ -105,7 +105,7 @@ "boringssl_rev": "22a0079b189c391b95689813a41982ce11876f0a", "browser-compat-data_tag": "ac8cae697014da1ff7124fba33b0b4245cc6cd1b", # v1.0.22 "cpu_features_rev": "936b9ab5515dead115606559502e3864958f7f6e", - "devtools_rev": "12d595649f189f1896722623f72599077f476848", + "devtools_rev": "21f1838f3a9b138ac377efb953ca5a53c8832e75", # Use the SHA found in `flutter-candidate.txt` in the devtools repo. "flutter_rev": "ad80825c24d770a19e33f67800fc0338a3b89ec7", "icu_rev": "d578f2e8b7bd5938e21cfb6bf15c079e0aa5b738",
diff --git a/pkg/dds/CHANGELOG.md b/pkg/dds/CHANGELOG.md index a34ab20..90d072e 100644 --- a/pkg/dds/CHANGELOG.md +++ b/pkg/dds/CHANGELOG.md
@@ -1,3 +1,7 @@ +# 5.5.0-wip + +- Require devtools_shared ^14.0.0 + # 5.4.0 - [DAP] Print truncated text from `dart:developer`'s `log()` if the full string has been collected.
diff --git a/pkg/dds/lib/src/devtools/machine_mode_command_handler.dart b/pkg/dds/lib/src/devtools/machine_mode_command_handler.dart index 1be7fd8..2b9d63f 100644 --- a/pkg/dds/lib/src/devtools/machine_mode_command_handler.dart +++ b/pkg/dds/lib/src/devtools/machine_mode_command_handler.dart
@@ -359,11 +359,11 @@ bool backupAndCreateDevToolsStore() { assert(_devToolsBackup == null); final devToolsStore = File( - LocalFileSystem.devToolsStoreLocation(), + FileSystemExtension.devToolsStoreLocation, ); if (devToolsStore.existsSync()) { _devToolsBackup = devToolsStore - .copySync('${LocalFileSystem.devToolsDir()}/.devtools_backup_test'); + .copySync('${FileSystemExtension.devToolsDir}/.devtools_backup_test'); devToolsStore.deleteSync(); } return true; @@ -372,9 +372,9 @@ String? restoreDevToolsStore() { if (_devToolsBackup != null) { // Read the current ~/.devtools file - LocalFileSystem.maybeMoveLegacyDevToolsStore(); + fileSystem.maybeMoveLegacyDevToolsStore(); - final devToolsStore = File(LocalFileSystem.devToolsStoreLocation()); + final devToolsStore = File(FileSystemExtension.devToolsStoreLocation); final content = devToolsStore.readAsStringSync(); // Delete the temporary ~/.devtools file @@ -382,7 +382,7 @@ if (_devToolsBackup!.existsSync()) { // Restore the backup ~/.devtools file we created in // backupAndCreateDevToolsStore. - _devToolsBackup!.copySync(LocalFileSystem.devToolsStoreLocation()); + _devToolsBackup!.copySync(FileSystemExtension.devToolsStoreLocation); _devToolsBackup!.deleteSync(); _devToolsBackup = null; }
diff --git a/pkg/dds/pubspec.yaml b/pkg/dds/pubspec.yaml index fdee41f..98b7d98 100644 --- a/pkg/dds/pubspec.yaml +++ b/pkg/dds/pubspec.yaml
@@ -1,5 +1,5 @@ name: dds -version: 5.4.0 +version: 5.5.0-wip description: >- A library used to spawn the Dart Developer Service, used to communicate with a Dart VM Service instance. @@ -16,7 +16,7 @@ collection: ^1.15.0 dap_adapters: ^1.0.0-wip dds_service_extensions: ^2.0.0 - devtools_shared: ^13.0.0 + devtools_shared: ^14.0.0-wip dtd: ^4.0.0 extension_discovery: ^2.0.0 http_multi_server: ^3.0.0