Merge branch 'master' of github.com:flutter/devtools into br

flutter · Nov 1, 2023 · 86bd8f0 · 86bd8f0
2 parents 5470302 + 9cfe8ea
commit 86bd8f0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/packages/devtools_app_shared/CHANGELOG.md b/packages/devtools_app_shared/CHANGELOG.md
@@ -1,4 +1,6 @@
 ## 0.0.7
+* Soften breaking change from 0.0.6 to add the `profilePlatformChannels` service extension,
+improving backwards compatibility for older versions of Flutter.
 * Bump the `devtools_shared` dependency to ^5.0.0
 * Remove public getter `libraryRef`, and public methods `getLibrary` and `retrieveFullValueAsString` from `EvalOnDartLibrary`.
 * Change `toString` output for `UnknownEvalException`, `EvalSentinelException`, and `EvalErrorException`.

diff --git a/packages/devtools_app_shared/lib/src/service/service_extensions.dart b/packages/devtools_app_shared/lib/src/service/service_extensions.dart
@@ -6,7 +6,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/scheduler.dart';
-import 'package:flutter/services.dart';
 
 class ServiceExtension<T> {
   ServiceExtension({
@@ -217,8 +216,10 @@ final trackRebuildWidgets = ToggleableServiceExtension<bool>(
 );
 
 final profilePlatformChannels = ToggleableServiceExtension<bool>(
-  extension:
-      '$flutterExtensionPrefix${ServicesServiceExtensions.profilePlatformChannels.name}',
+  // TODO(kenz): use ${ServicesServiceExtensions.profilePlatformChannels.name}
+  // once this enum value has existed on Flutter stable for a reasonable amount
+  // of time (6 months, or June 2024).
+  extension: '${flutterExtensionPrefix}profilePlatformChannels',
   enabledValue: true,
   disabledValue: false,
 );

diff --git a/packages/devtools_extensions/README.md b/packages/devtools_extensions/README.md
@@ -200,8 +200,8 @@ source code. Once you have done this, run `pub get`, and run the application.
     * **If you need local or unreleased changes from DevTools**, you'll need to build and run DevTools
     from source. See the DevTools [CONTRIBUTING.md]() for a guide on how to do this.
         > Note: you'll need to build DevTools with the server and the front end to test extensions - see
-        [instructions](https://github.com/flutter/devtools/blob/master/CONTRIBUTING.md#development-devtools-server--devtools-flutter-web-app).
-    * **If not, and if your local Dart or Flutter SDK version is >= `<TODO: insert version>`**,
+        > [instructions](https://github.com/flutter/devtools/blob/master/CONTRIBUTING.md#development-devtools-server--devtools-flutter-web-app).
+    * **If not, and if your local Dart or Flutter SDK version is >= 3.16.0-0.1.pre**,
     you can launch the DevTools instance that was just started by running your app (either from
     a url printed to command line or from the IDE where you ran your test app). You can also run
     `dart devtools` from the command line.

diff --git a/tool/bin/devtools_tool.dart b/tool/bin/devtools_tool.dart
@@ -6,11 +6,14 @@ import 'dart:io';
 
 import 'package:args/command_runner.dart';
 import 'package:devtools_tool/devtools_command_runner.dart';
+import 'package:io/io.dart';
 
 void main(List<String> args) async {
   final runner = DevToolsCommandRunner();
   try {
-    final dynamic result = await runner.run(args);
+    final dynamic result =
+        await runner.run(args).whenComplete(sharedStdIn.terminate);
+
     exit(result is int ? result : 0);
   } catch (e) {
     if (e is UsageException) {

diff --git a/tool/lib/devtools_command_runner.dart b/tool/lib/devtools_command_runner.dart
@@ -2,14 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
 import 'package:devtools_tool/commands/build_release.dart';
 import 'package:devtools_tool/commands/fix_goldens.dart';
 import 'package:devtools_tool/commands/generate_code.dart';
 import 'package:devtools_tool/commands/sync.dart';
 import 'package:devtools_tool/commands/update_flutter_sdk.dart';
-import 'package:io/io.dart';
 
 import 'commands/analyze.dart';
 import 'commands/list.dart';
@@ -37,14 +35,4 @@ class DevToolsCommandRunner extends CommandRunner {
     addCommand(UpdateDevToolsVersionCommand());
     addCommand(UpdateFlutterSdkCommand());
   }
-
-  @override
-  Future runCommand(ArgResults topLevelResults) async {
-    try {
-      return await super.runCommand(topLevelResults);
-    } finally {
-      // Closes stdin for the entire program.
-      await sharedStdIn.terminate();
-    }
-  }
 }