Prepare for release 2.42.0 (#8673)
diff --git a/flutter-candidate.txt b/flutter-candidate.txt index de3483f..6a59b56 100644 --- a/flutter-candidate.txt +++ b/flutter-candidate.txt
@@ -1 +1 @@ -2eee054d41f641db335f35797d39fc77ed124430 +434ca754e3b972725938d72b83bfa84f083fb0a7
diff --git a/packages/devtools_app/benchmark/web_bundle_size_test.dart b/packages/devtools_app/benchmark/web_bundle_size_test.dart index 9f8f12a..933d9f2 100644 --- a/packages/devtools_app/benchmark/web_bundle_size_test.dart +++ b/packages/devtools_app/benchmark/web_bundle_size_test.dart
@@ -11,7 +11,7 @@ import 'package:test/test.dart'; // Benchmark size in kB. -const bundleSizeBenchmark = 5200; +const bundleSizeBenchmark = 5400; const gzipBundleSizeBenchmark = 1550; void main() {
diff --git a/packages/devtools_app/lib/devtools.dart b/packages/devtools_app/lib/devtools.dart index c1d2ce5..dc1bc0b 100644 --- a/packages/devtools_app/lib/devtools.dart +++ b/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.42.0-dev.1'; +const version = '2.42.0';
diff --git a/packages/devtools_app/lib/src/screens/debugger/program_explorer_controller.dart b/packages/devtools_app/lib/src/screens/debugger/program_explorer_controller.dart index 99f0ab2..2332f1b 100644 --- a/packages/devtools_app/lib/src/screens/debugger/program_explorer_controller.dart +++ b/packages/devtools_app/lib/src/screens/debugger/program_explorer_controller.dart
@@ -352,8 +352,7 @@ final targetScript = switch (object) { ClassRef(:final location?) || FieldRef(:final location?) || - FuncRef(:final location?) => - location.script, + FuncRef(:final location?) => location.script, Code(:final function?) => function.location?.script, ScriptRef() => object, _ => null,
diff --git a/packages/devtools_app/lib/src/screens/debugger/program_explorer_model.dart b/packages/devtools_app/lib/src/screens/debugger/program_explorer_model.dart index 282ddad..22571c6 100644 --- a/packages/devtools_app/lib/src/screens/debugger/program_explorer_model.dart +++ b/packages/devtools_app/lib/src/screens/debugger/program_explorer_model.dart
@@ -333,8 +333,7 @@ final sourceLocation = switch (object) { FieldRef(:final location) || FuncRef(:final location) || - ClassRef(:final location) => - location, + ClassRef(:final location) => location, _ => null, };
diff --git a/packages/devtools_app/lib/src/screens/profiler/cpu_profile_model.dart b/packages/devtools_app/lib/src/screens/profiler/cpu_profile_model.dart index 93ca122..791cff6 100644 --- a/packages/devtools_app/lib/src/screens/profiler/cpu_profile_model.dart +++ b/packages/devtools_app/lib/src/screens/profiler/cpu_profile_model.dart
@@ -1254,13 +1254,10 @@ String? get resolvedUrl => isCodeTree && _function is vm_service.FuncRef? ? - // TODO(bkonyi): not sure if this is a resolved URL or not, but it's not - // critical since this is only displayed when VM developer mode is - // enabled. - (_function as vm_service.FuncRef?) - ?.location - ?.script - ?.uri + // TODO(bkonyi): not sure if this is a resolved URL or not, but it's not + // critical since this is only displayed when VM developer mode is + // enabled. + (_function as vm_service.FuncRef?)?.location?.script?.uri : samples.functions![index].resolvedUrl; int? get sourceLine {
diff --git a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/inbound_references_tree.dart b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/inbound_references_tree.dart index cedffd0..6e52b5a 100644 --- a/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/inbound_references_tree.dart +++ b/packages/devtools_app/lib/src/screens/vm_developer/object_inspector/inbound_references_tree.dart
@@ -35,8 +35,9 @@ } return switch (objectRef) { - ClassRef(:final name) || FuncRef(:final name) || FieldRef(:final name) => - name, + ClassRef(:final name) || + FuncRef(:final name) || + FieldRef(:final name) => name, LibraryRef(:final name, :final uri) => name.isNullOrEmpty ? uri : name, ScriptRef(:final uri) => fileNameFromUri(uri), InstanceRef(:final name, :final classRef) =>
diff --git a/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart b/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart index aedee03..3c0b63e 100644 --- a/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart +++ b/packages/devtools_app/lib/src/screens/vm_developer/vm_developer_common_widgets.dart
@@ -641,8 +641,7 @@ FieldRef(:final name) || FuncRef(:final name) || CodeRef(:final name) || - TypeArgumentsRef(:final name) => - name, + TypeArgumentsRef(:final name) => name, // If a class has an empty name, it's a special "top level" class. ClassRef(:final name) => name!.isEmpty ? 'top-level-class' : name, LibraryRef(:final uri, :final name) =>
diff --git a/packages/devtools_app/lib/src/shared/charts/chart_controller.dart b/packages/devtools_app/lib/src/shared/charts/chart_controller.dart index 65078e1..603e105 100644 --- a/packages/devtools_app/lib/src/shared/charts/chart_controller.dart +++ b/packages/devtools_app/lib/src/shared/charts/chart_controller.dart
@@ -221,19 +221,17 @@ if (lastDT.difference(firstDT).inMinutes >= duration.inMinutes) { // Grab the duration in minutes passed in. final startOfLastNMinutes = - // We need this cast to be able to return null if nothing is found. - // ignore: unnecessary_cast - timestamps - .reversed - .firstWhereOrNull((timestamp) { - final currentDT = DateTime.fromMillisecondsSinceEpoch(timestamp); - final diff = lastDT.difference(currentDT); - if (diff.inMinutes >= duration.inMinutes) { - return true; - } + // We need this cast to be able to return null if nothing is found. + // ignore: unnecessary_cast + timestamps.reversed.firstWhereOrNull((timestamp) { + final currentDT = DateTime.fromMillisecondsSinceEpoch(timestamp); + final diff = lastDT.difference(currentDT); + if (diff.inMinutes >= duration.inMinutes) { + return true; + } - return false; - }); + return false; + }); final ticksVisible = startOfLastNMinutes != null
diff --git a/packages/devtools_app/lib/src/shared/framework/screen.dart b/packages/devtools_app/lib/src/shared/framework/screen.dart index 8d5c93e..e43b1af 100644 --- a/packages/devtools_app/lib/src/shared/framework/screen.dart +++ b/packages/devtools_app/lib/src/shared/framework/screen.dart
@@ -393,7 +393,9 @@ size: iconAsset != null // Add 1.0 to adjust for margins on the screen icon assets. - ? scaleByFontFactor(defaultIconSizeBeforeScaling + 1.0) + ? scaleByFontFactor( + defaultIconSizeBeforeScaling + 1.0, + ) : defaultIconSize, ), if (title.isNotEmpty)
diff --git a/packages/devtools_app/lib/src/shared/memory/classes.dart b/packages/devtools_app/lib/src/shared/memory/classes.dart index 5dc0c49..f7d4f15 100644 --- a/packages/devtools_app/lib/src/shared/memory/classes.dart +++ b/packages/devtools_app/lib/src/shared/memory/classes.dart
@@ -194,8 +194,7 @@ @override // ignore: avoid-explicit-type-declaration, required to override base class. - final ObjectSet - objects = ObjectSet(); + final ObjectSet objects = ObjectSet(); @override final byPath = <PathFromRoot, ObjectSetStats>{};
diff --git a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart index fbc62f7..eff5564 100644 --- a/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart +++ b/packages/devtools_app/lib/src/standalone_ui/vs_code/devtools/devtools_view.dart
@@ -177,12 +177,10 @@ ScreenMetaData.debugger || ScreenMetaData.vmTools || // This screen will be removed from the first party DevTools screens soon. - // If the user depends on package:provider, the provider extension should - // show up in the DevTools extensions list instead. - ScreenMetaData - .provider || - ScreenMetaData.simple => - false, + // If the user depends on package:provider, the provider extension should + // show up in the DevTools extensions list instead. + ScreenMetaData.provider || + ScreenMetaData.simple => false, _ => true, }; }
diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index dcae8ce..249e60c 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml
@@ -4,7 +4,7 @@ # 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.42.0-dev.1 +version: 2.42.0 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app
diff --git a/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md b/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md index 1f9b806..19325a0 100644 --- a/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md +++ b/packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md
@@ -20,46 +20,6 @@ * Enabled auto-refreshes of the widget tree on hot-reloads and navigation events by default. This can be disabled in the inspector settings. - [#8646](https://github.com/flutter/devtools/pull/8646)  -## Performance updates - -TODO: Remove this section if there are not any general updates. - -## CPU profiler updates - -TODO: Remove this section if there are not any general updates. - -## Memory updates - -TODO: Remove this section if there are not any general updates. - -## Debugger updates - -TODO: Remove this section if there are not any general updates. - -## Network profiler updates - -TODO: Remove this section if there are not any general updates. - -## Logging updates - -TODO: Remove this section if there are not any general updates. - -## App size tool updates - -TODO: Remove this section if there are not any general updates. - -## Deep links tool updates - -TODO: Remove this section if there are not any general updates. - -## VS Code Sidebar updates - -TODO: Remove this section if there are not any general updates. - -## DevTools Extension updates - -TODO: Remove this section if there are not any general updates. - ## Full commit history To find a complete list of changes in this release, check out the
diff --git a/packages/devtools_app/test/test_infra/goldens/settings_dialog_default.png b/packages/devtools_app/test/test_infra/goldens/settings_dialog_default.png index 85eafe9..e394284 100644 --- a/packages/devtools_app/test/test_infra/goldens/settings_dialog_default.png +++ b/packages/devtools_app/test/test_infra/goldens/settings_dialog_default.png Binary files differ
diff --git a/packages/devtools_app/test/test_infra/goldens/settings_dialog_modified.png b/packages/devtools_app/test/test_infra/goldens/settings_dialog_modified.png index 2d48e12..5439001 100644 --- a/packages/devtools_app/test/test_infra/goldens/settings_dialog_modified.png +++ b/packages/devtools_app/test/test_infra/goldens/settings_dialog_modified.png Binary files differ
diff --git a/packages/devtools_app/test/test_infra/test_data/memory/heap/heap_graph_fakes.dart b/packages/devtools_app/test/test_infra/test_data/memory/heap/heap_graph_fakes.dart index d33a587..ec6714a 100644 --- a/packages/devtools_app/test/test_infra/test_data/memory/heap/heap_graph_fakes.dart +++ b/packages/devtools_app/test/test_infra/test_data/memory/heap/heap_graph_fakes.dart
@@ -24,16 +24,14 @@ @override // ignore: avoid-explicit-type-declaration, required to override base class. - final List<HeapSnapshotClass> - classes = <HeapSnapshotClass>[ + final List<HeapSnapshotClass> classes = <HeapSnapshotClass>[ _FakeHeapSnapshotClass(), _FakeHeapSnapshotClass.weak(), ]; @override // ignore: avoid-explicit-type-declaration, required to override base class. - final List<FakeSnapshotObject> - objects = <FakeSnapshotObject>[ + final List<FakeSnapshotObject> objects = <FakeSnapshotObject>[ _sentinelObject, FakeSnapshotObject(shallowSize: 1), // root ];
diff --git a/packages/devtools_test/lib/src/mocks/fake_service_manager.dart b/packages/devtools_test/lib/src/mocks/fake_service_manager.dart index d430dd1..33af9d0 100644 --- a/packages/devtools_test/lib/src/mocks/fake_service_manager.dart +++ b/packages/devtools_test/lib/src/mocks/fake_service_manager.dart
@@ -180,8 +180,8 @@ @override // ignore: avoid-explicit-type-declaration, required to override base class. - final FakeServiceExtensionManager - serviceExtensionManager = FakeServiceExtensionManager(); + final FakeServiceExtensionManager serviceExtensionManager = + FakeServiceExtensionManager(); @override ConnectedApp? connectedApp = MockConnectedApp();
diff --git a/tool/lib/commands/run.dart b/tool/lib/commands/run.dart index 1ceade6..e0ecc6f 100644 --- a/tool/lib/commands/run.dart +++ b/tool/lib/commands/run.dart
@@ -10,7 +10,7 @@ /// Runs the DevTools web app in debug mode with `flutter run` and connects it /// to a locally running instance of the DevTools server. -/// +/// /// To open a debug connection to the DevTools server, pass the `--debug-server` /// flag to this command. class RunCommand extends Command {
diff --git a/tool/lib/model.dart b/tool/lib/model.dart index bfa84cd..8d481e6 100644 --- a/tool/lib/model.dart +++ b/tool/lib/model.dart
@@ -122,10 +122,10 @@ } else { final ancestor = result.firstWhereOrNull( (p) => - // Remove the last segment of [dir]'s pathSegments to ensure we - // are only checking ancestors and not sibling directories with - // similar names. - (List.from(dir.uri.pathSegments)..safeRemoveLast()) + // Remove the last segment of [dir]'s pathSegments to ensure we + // are only checking ancestors and not sibling directories with + // similar names. + (List.from(dir.uri.pathSegments)..safeRemoveLast()) // TODO(kenz): this may cause issues for Windows paths. .join('/') .startsWith(p.packagePath),
