Skip to content

Commit e5134ff

Browse files
authored
Bump Dart SDK minimums to Dart 3.11.0. (#9848)
1 parent 580b1ef commit e5134ff

14 files changed

Lines changed: 64 additions & 68 deletions

File tree

packages/devtools_app/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ version: 2.60.0-dev.0
1212
repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app
1313

1414
environment:
15-
sdk: ">=3.8.0-265.0.dev <4.0.0"
16-
flutter: ">=3.32.0-1.0.pre.73"
15+
sdk: ^3.11.0
16+
flutter: ^3.41.0
1717

1818
resolution: workspace
1919

packages/devtools_app_shared/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ found in the LICENSE file or at https://developers.google.com/open-source/licens
66
## 0.5.2-wip
77
* Fix a `RangeError` thrown by `SplitPane` when the number of children
88
changes between rebuilds.
9+
* The minimum Dart SDK version is bumped to 3.11.0.
10+
* The minimum Flutter SDK version is bumped to 3.41.0.
911

1012
## 0.5.1
1113
* Add DevTools-styled text field `DevToolsTextField`.

packages/devtools_app_shared/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ version: 0.5.2-wip
77
repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app_shared
88

99
environment:
10-
sdk: ">=3.6.0 <4.0.0"
11-
flutter: ">=3.27.1"
10+
sdk: ^3.11.0
11+
flutter: ^3.41.0
1212

1313
resolution: workspace
1414

packages/devtools_extensions/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ Copyright 2025 The Flutter Authors
33
Use of this source code is governed by a BSD-style license that can be
44
found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
55
-->
6+
## 0.5.2-wip
7+
* The minimum Dart SDK version is bumped to 3.11.0.
8+
* The minimum Flutter SDK version is bumped to 3.41.0.
9+
610
## 0.5.1
711
* Updates `devtools_app_shared` constraint to `^0.5.1`.
812
* Updates `devtools_shared` constraint to `^13.0.0`.

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

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@ import 'api.dart';
1010
/// See [DevToolsExtensionEventType] for different types of events that are
1111
/// supported over this communication channel.
1212
class DevToolsExtensionEvent {
13-
DevToolsExtensionEvent(
14-
this.type, {
15-
this.data,
16-
this.source,
17-
});
13+
DevToolsExtensionEvent(this.type, {this.data, this.source});
1814

1915
factory DevToolsExtensionEvent.parse(Map<String, Object?> json) {
20-
final eventType =
21-
DevToolsExtensionEventType.from(json[_typeKey]! as String);
16+
final eventType = DevToolsExtensionEventType.from(
17+
json[_typeKey]! as String,
18+
);
2219
final data = (json[_dataKey] as Map?)?.cast<String, Object?>();
2320
final source = json[sourceKey] as String?;
2421
return DevToolsExtensionEvent(eventType, data: data, source: source);
@@ -44,10 +41,7 @@ class DevToolsExtensionEvent {
4441
final String? source;
4542

4643
Map<String, Object?> toJson() {
47-
return {
48-
_typeKey: type.name,
49-
if (data != null) _dataKey: data!,
50-
};
44+
return {_typeKey: type.name, _dataKey: ?data};
5145
}
5246

5347
@override
@@ -65,10 +59,10 @@ typedef ExtensionEventHandler = void Function(DevToolsExtensionEvent event);
6559
/// notification the the DevTools notification framework.
6660
class ShowNotificationExtensionEvent extends DevToolsExtensionEvent {
6761
ShowNotificationExtensionEvent({required String message})
68-
: super(
69-
DevToolsExtensionEventType.showNotification,
70-
data: {_messageKey: message},
71-
);
62+
: super(
63+
DevToolsExtensionEventType.showNotification,
64+
data: {_messageKey: message},
65+
);
7266

7367
factory ShowNotificationExtensionEvent.from(DevToolsExtensionEvent event) {
7468
assert(event.type == DevToolsExtensionEventType.showNotification);
@@ -93,18 +87,18 @@ class ShowBannerMessageExtensionEvent extends DevToolsExtensionEvent {
9387
required String extensionName,
9488
bool ignoreIfAlreadyDismissed = true,
9589
bool dismissOnConnectionChanges = true,
96-
}) : assert(bannerMessageType == 'warning' || bannerMessageType == 'error'),
97-
super(
98-
DevToolsExtensionEventType.showBannerMessage,
99-
data: {
100-
_idKey: id,
101-
_bannerMessageTypeKey: bannerMessageType,
102-
_messageKey: message,
103-
_extensionNameKey: extensionName,
104-
_ignoreIfAlreadyDismissedKey: ignoreIfAlreadyDismissed,
105-
_dismissOnConnectionChangesKey: dismissOnConnectionChanges,
106-
},
107-
);
90+
}) : assert(bannerMessageType == 'warning' || bannerMessageType == 'error'),
91+
super(
92+
DevToolsExtensionEventType.showBannerMessage,
93+
data: {
94+
_idKey: id,
95+
_bannerMessageTypeKey: bannerMessageType,
96+
_messageKey: message,
97+
_extensionNameKey: extensionName,
98+
_ignoreIfAlreadyDismissedKey: ignoreIfAlreadyDismissed,
99+
_dismissOnConnectionChangesKey: dismissOnConnectionChanges,
100+
},
101+
);
108102

109103
factory ShowBannerMessageExtensionEvent.from(DevToolsExtensionEvent event) {
110104
assert(event.type == DevToolsExtensionEventType.showBannerMessage);
@@ -154,12 +148,9 @@ class CopyToClipboardExtensionEvent extends DevToolsExtensionEvent {
154148
required String content,
155149
String successMessage = defaultSuccessMessage,
156150
}) : super(
157-
DevToolsExtensionEventType.copyToClipboard,
158-
data: {
159-
_contentKey: content,
160-
_successMessageKey: successMessage,
161-
},
162-
);
151+
DevToolsExtensionEventType.copyToClipboard,
152+
data: {_contentKey: content, _successMessageKey: successMessage},
153+
);
163154

164155
factory CopyToClipboardExtensionEvent.from(DevToolsExtensionEvent event) {
165156
assert(event.type == DevToolsExtensionEventType.copyToClipboard);

packages/devtools_extensions/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
44
name: devtools_extensions
55
description: A package for building and supporting extensions for Dart DevTools.
6-
version: 0.5.1
6+
version: 0.5.2-wip
77

88
repository: https://github.com/flutter/devtools/tree/master/packages/devtools_extensions
99

1010
environment:
11-
sdk: ">=3.6.0 <4.0.0"
12-
flutter: ">=3.27.1"
11+
sdk: ^3.11.0
12+
flutter: ^3.41.0
1313

1414
resolution: workspace
1515

packages/devtools_shared/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ Copyright 2025 The Flutter Authors
33
Use of this source code is governed by a BSD-style license that can be
44
found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
55
-->
6+
# 13.0.2-wip
7+
* The minimum Dart SDK version is bumped to 3.11.0.
8+
* The minimum Flutter SDK version is bumped to 3.41.0.
9+
610
# 13.0.1
711
* Handle null values for `FlutterStore.flutterClientId`.
812

packages/devtools_shared/lib/src/server/server_api.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ part 'handlers/_app_size.dart';
3030
part 'handlers/_deeplink.dart';
3131
part 'handlers/_devtools_extensions.dart';
3232
part 'handlers/_dtd.dart';
33-
part 'handlers/_vm_service.dart';
3433
part 'handlers/_preferences.dart';
3534
part 'handlers/_release_notes.dart';
3635
part 'handlers/_storage.dart';
3736
part 'handlers/_survey.dart';
37+
part 'handlers/_vm_service.dart';
3838

3939
/// The DevTools server API.
4040
///
@@ -268,10 +268,7 @@ class ServerApi {
268268
return shelf.Response(
269269
HttpStatus.internalServerError,
270270
body: error != null || logs != null
271-
? jsonEncode(<String, Object?>{
272-
if (error != null) errorKey: error,
273-
if (logs != null) logsKey: logs,
274-
})
271+
? jsonEncode({errorKey: ?error, logsKey: ?logs})
275272
: null,
276273
);
277274
}

packages/devtools_shared/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
name: devtools_shared
55
description: Package of shared Dart structures between devtools_app, dds, and other tools.
66

7-
version: 13.0.1
7+
version: 13.0.2-dev
88

99
repository: https://github.com/flutter/devtools/tree/master/packages/devtools_shared
1010

1111
environment:
12-
sdk: ">=3.6.0 <4.0.0"
12+
sdk: ^3.11.0
1313

1414
resolution: workspace
1515

packages/devtools_test/lib/src/mocks/fake_isolate_manager.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ base class FakeIsolateManager extends Fake with TestIsolateManager {
3232

3333
@override
3434
ValueNotifier<List<IsolateRef>> get isolates {
35-
final value = _selectedIsolate.value;
36-
_isolates ??= ValueNotifier([if (value != null) value]);
37-
return _isolates!;
35+
return _isolates ??= ValueNotifier([?_selectedIsolate.value]);
3836
}
3937

4038
final _pausedState = ValueNotifier<bool>(false);

0 commit comments

Comments
 (0)