Merge branch 'master' into fix/network-hot-restart

Author: muhammadkamel

flutter-candidate.txt

@@ -1 +1 @@
-f3a4b989783497d9c904b7f0363886248c9175e4
+3648ed5372a7baa2941539b457a3c804ca0afd86

packages/devtools_app/lib/devtools.dart

@@ -10,4 +10,4 @@
 /// Note: a regexp in the `dt update-version' command logic matches the constant
 /// declaration `const version =`. If you change the declaration you must also
 /// modify the regex in the `dt update-version' command logic.
-const version = '2.59.0-dev.0';
+const version = '2.60.0-dev.0';

packages/devtools_app/pubspec.yaml

@@ -7,13 +7,13 @@ publish_to: none
 
 # Note: this version should only be updated by running the 'dt update-version'
 # command that updates the version here and in 'devtools.dart'.
-version: 2.59.0-dev.0
+version: 2.60.0-dev.0
 
 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app
 
 environment:
-  sdk: ">=3.8.0-265.0.dev <4.0.0"
-  flutter: ">=3.32.0-1.0.pre.73"
+  sdk: ^3.11.0
+  flutter: ^3.41.0
 
 resolution: workspace
 

packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md

@@ -6,23 +6,20 @@ found in the LICENSE file or at https://developers.google.com/open-source/licens
 This is a draft for future release notes that are going to land on
 [the Flutter website](https://docs.flutter.dev/tools/devtools/release-notes).
 
-# DevTools 2.59.0 release notes
+# DevTools 2.60.0 release notes
 
-The 2.59.0 release of the Dart and Flutter DevTools
+The 2.60.0 release of the Dart and Flutter DevTools
 includes the following changes among other general improvements.
 To learn more about DevTools, check out the
 [DevTools overview](/tools/devtools).
 
 ## General updates
 
-* Fixed a `RangeError` thrown by `SplitPane` when the parent rebuilt the
-  widget with a different number of children, for example when toggling a
-  panel in or out of the layout. -
-  [#9822](https://github.com/flutter/devtools/pull/9822)
+TODO: Remove this section if there are not any updates.
 
 ## Inspector updates
 
-- Fixed an issue where hover tooltips in the widget tree were being clipped by the window boundaries. [#9823](https://github.com/flutter/devtools/pull/9823)
+TODO: Remove this section if there are not any updates.
 
 ## Performance updates
 
@@ -79,4 +76,4 @@ TODO: Remove this section if there are not any updates.
 ## Full commit history
 
 To find a complete list of changes in this release, check out the
-[DevTools git log](https://github.com/flutter/devtools/tree/v2.59.0).
+[DevTools git log](https://github.com/flutter/devtools/tree/v2.60.0).

packages/devtools_app_shared/CHANGELOG.md

@@ -8,6 +8,8 @@ found in the LICENSE file or at https://developers.google.com/open-source/licens
   changes between rebuilds.
 * Add `IsolateManager.onIsolateCreated` stream for detecting when new isolates
   are spawned.
+* The minimum Dart SDK version is bumped to 3.11.0.
+* The minimum Flutter SDK version is bumped to 3.41.0.
 
 ## 0.5.1
 * Add DevTools-styled text field `DevToolsTextField`.

packages/devtools_app_shared/pubspec.yaml

@@ -7,8 +7,8 @@ version: 0.5.2-wip
 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app_shared
 
 environment:
-  sdk: ">=3.6.0 <4.0.0"
-  flutter: ">=3.27.1"
+  sdk: ^3.11.0
+  flutter: ^3.41.0
 
 resolution: workspace
 

packages/devtools_extensions/CHANGELOG.md

@@ -3,6 +3,10 @@ Copyright 2025 The Flutter Authors
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 -->
+## 0.5.2-wip
+* The minimum Dart SDK version is bumped to 3.11.0.
+* The minimum Flutter SDK version is bumped to 3.41.0.
+
 ## 0.5.1
 * Updates `devtools_app_shared` constraint to `^0.5.1`.
 * Updates `devtools_shared` constraint to `^13.0.0`.

packages/devtools_extensions/lib/src/api/model.dart

@@ -10,15 +10,12 @@ import 'api.dart';
 /// See [DevToolsExtensionEventType] for different types of events that are
 /// supported over this communication channel.
 class DevToolsExtensionEvent {
-  DevToolsExtensionEvent(
-    this.type, {
-    this.data,
-    this.source,
-  });
+  DevToolsExtensionEvent(this.type, {this.data, this.source});
 
   factory DevToolsExtensionEvent.parse(Map<String, Object?> json) {
-    final eventType =
-        DevToolsExtensionEventType.from(json[_typeKey]! as String);
+    final eventType = DevToolsExtensionEventType.from(
+      json[_typeKey]! as String,
+    );
     final data = (json[_dataKey] as Map?)?.cast<String, Object?>();
     final source = json[sourceKey] as String?;
     return DevToolsExtensionEvent(eventType, data: data, source: source);
@@ -44,10 +41,7 @@ class DevToolsExtensionEvent {
   final String? source;
 
   Map<String, Object?> toJson() {
-    return {
-      _typeKey: type.name,
-      if (data != null) _dataKey: data!,
-    };
+    return {_typeKey: type.name, _dataKey: ?data};
   }
 
   @override
@@ -65,10 +59,10 @@ typedef ExtensionEventHandler = void Function(DevToolsExtensionEvent event);
 /// notification the the DevTools notification framework.
 class ShowNotificationExtensionEvent extends DevToolsExtensionEvent {
   ShowNotificationExtensionEvent({required String message})
-      : super(
-          DevToolsExtensionEventType.showNotification,
-          data: {_messageKey: message},
-        );
+    : super(
+        DevToolsExtensionEventType.showNotification,
+        data: {_messageKey: message},
+      );
 
   factory ShowNotificationExtensionEvent.from(DevToolsExtensionEvent event) {
     assert(event.type == DevToolsExtensionEventType.showNotification);
@@ -93,18 +87,18 @@ class ShowBannerMessageExtensionEvent extends DevToolsExtensionEvent {
     required String extensionName,
     bool ignoreIfAlreadyDismissed = true,
     bool dismissOnConnectionChanges = true,
-  })  : assert(bannerMessageType == 'warning' || bannerMessageType == 'error'),
-        super(
-          DevToolsExtensionEventType.showBannerMessage,
-          data: {
-            _idKey: id,
-            _bannerMessageTypeKey: bannerMessageType,
-            _messageKey: message,
-            _extensionNameKey: extensionName,
-            _ignoreIfAlreadyDismissedKey: ignoreIfAlreadyDismissed,
-            _dismissOnConnectionChangesKey: dismissOnConnectionChanges,
-          },
-        );
+  }) : assert(bannerMessageType == 'warning' || bannerMessageType == 'error'),
+       super(
+         DevToolsExtensionEventType.showBannerMessage,
+         data: {
+           _idKey: id,
+           _bannerMessageTypeKey: bannerMessageType,
+           _messageKey: message,
+           _extensionNameKey: extensionName,
+           _ignoreIfAlreadyDismissedKey: ignoreIfAlreadyDismissed,
+           _dismissOnConnectionChangesKey: dismissOnConnectionChanges,
+         },
+       );
 
   factory ShowBannerMessageExtensionEvent.from(DevToolsExtensionEvent event) {
     assert(event.type == DevToolsExtensionEventType.showBannerMessage);
@@ -154,12 +148,9 @@ class CopyToClipboardExtensionEvent extends DevToolsExtensionEvent {
     required String content,
     String successMessage = defaultSuccessMessage,
   }) : super(
-          DevToolsExtensionEventType.copyToClipboard,
-          data: {
-            _contentKey: content,
-            _successMessageKey: successMessage,
-          },
-        );
+         DevToolsExtensionEventType.copyToClipboard,
+         data: {_contentKey: content, _successMessageKey: successMessage},
+       );
 
   factory CopyToClipboardExtensionEvent.from(DevToolsExtensionEvent event) {
     assert(event.type == DevToolsExtensionEventType.copyToClipboard);

packages/devtools_extensions/pubspec.yaml

@@ -3,13 +3,13 @@
 # found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 name: devtools_extensions
 description: A package for building and supporting extensions for Dart DevTools.
-version: 0.5.1
+version: 0.5.2-wip
 
 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_extensions
 
 environment:
-  sdk: ">=3.6.0 <4.0.0"
-  flutter: ">=3.27.1"
+  sdk: ^3.11.0
+  flutter: ^3.41.0
 
 resolution: workspace
 

packages/devtools_shared/CHANGELOG.md

@@ -3,6 +3,10 @@ Copyright 2025 The Flutter Authors
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 -->
+# 13.0.2-wip
+* The minimum Dart SDK version is bumped to 3.11.0.
+* The minimum Flutter SDK version is bumped to 3.41.0.
+
 # 13.0.1
 * Handle null values for `FlutterStore.flutterClientId`.