From 210592d25770d7ad54a0c3e16c7cc5c3359c483f Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Tue, 28 Jan 2025 13:09:17 -0500 Subject: [PATCH 1/6] Reenable Code based profiling when VM Developer Mode is enabled Fixes https://github.com/flutter/devtools/issues/8567 --- .../devtools_app/lib/src/service/vm_service_wrapper.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/devtools_app/lib/src/service/vm_service_wrapper.dart b/packages/devtools_app/lib/src/service/vm_service_wrapper.dart index 114eca293d6..04d44be766d 100644 --- a/packages/devtools_app/lib/src/service/vm_service_wrapper.dart +++ b/packages/devtools_app/lib/src/service/vm_service_wrapper.dart @@ -20,6 +20,7 @@ import 'package:vm_service/vm_service.dart'; import '../screens/vm_developer/vm_service_private_extensions.dart'; import '../shared/feature_flags.dart'; +import '../shared/globals.dart'; import '../shared/primitives/utils.dart'; import 'json_to_service_cache.dart'; @@ -142,9 +143,7 @@ class VmServiceWrapper extends VmService { // running with VM developer mode enabled. This data isn't accessible // in non-VM developer mode, so not requesting the code profile will // save on space and network usage. - // TODO(bkonyi): re-enable when package:vm_service 15.0.0 is rolled - // into Flutter. See https://github.com/flutter/devtools/issues/8567. - // '_code': preferences.vmDeveloperModeEnabled.value, + '_code': preferences.vmDeveloperModeEnabled.value, }, ).then((e) => e as CpuSamples); } From cd16c57e96a87194035f080c1053cc91976139b1 Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Fri, 31 Jan 2025 14:55:53 -0500 Subject: [PATCH 2/6] Prepare for releases of devtools_app_shared and devtools_extensions --- packages/devtools_app/pubspec.yaml | 2 +- packages/devtools_app_shared/CHANGELOG.md | 6 ++++-- packages/devtools_app_shared/pubspec.yaml | 2 +- packages/devtools_extensions/CHANGELOG.md | 4 +++- packages/devtools_extensions/pubspec.yaml | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index f8d087d8e5a..b8790867653 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml @@ -51,7 +51,7 @@ dependencies: stack_trace: ^1.12.0 string_scanner: ^1.1.0 unified_analytics: ^7.0.0 - vm_service: '>=13.0.0 <16.0.0' + vm_service: ">=15.0.0 <16.0.0" vm_service_protos: ^1.0.0 vm_snapshot_analysis: ^0.7.6 web: ^1.0.0 diff --git a/packages/devtools_app_shared/CHANGELOG.md b/packages/devtools_app_shared/CHANGELOG.md index fe2a5f493b3..be797c7e35c 100644 --- a/packages/devtools_app_shared/CHANGELOG.md +++ b/packages/devtools_app_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. --> +## 0.3.1 +* Add "Supported Flutter versions" policy to the README. +* Bump `vm_service` dependency to `>=13.0.0 <16.0.0`. + ## 0.3.0 * Bump minimum Dart SDK version to `3.6.0`. * Bump minimum Flutter SDK version to `3.27.1`. @@ -10,8 +14,6 @@ found in the LICENSE file or at https://developers.google.com/open-source/licens * Add `DevToolsIcon` and `AssetImageIcon` widgets. * Add `iconAsset` and `iconSize` fields to the `ButtonGroupItemData` class. * Add `iconAsset` and `iconSize` fields to the `MaterialIconLabel` class. -* Add "Supported Flutter versions" policy to the README. -* Bump `vm_service` dependency to `>=13.0.0 <16.0.0`. ## 0.2.4 * Add `updateQueryParameter` utility method. diff --git a/packages/devtools_app_shared/pubspec.yaml b/packages/devtools_app_shared/pubspec.yaml index 573868e4450..8b53601ae18 100644 --- a/packages/devtools_app_shared/pubspec.yaml +++ b/packages/devtools_app_shared/pubspec.yaml @@ -3,7 +3,7 @@ # found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd. name: devtools_app_shared description: Package of Dart & Flutter structures shared between devtools_app and devtools extensions. -version: 0.3.0 +version: 0.3.1 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app_shared environment: diff --git a/packages/devtools_extensions/CHANGELOG.md b/packages/devtools_extensions/CHANGELOG.md index 509f94a982a..c51cab28559 100644 --- a/packages/devtools_extensions/CHANGELOG.md +++ b/packages/devtools_extensions/CHANGELOG.md @@ -3,13 +3,15 @@ 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.3.1 +* Bump `vm_service` dependency to `>=13.0.0 <16.0.0`. + ## 0.3.0 * Fix `build_and_copy` command by removing deprecated `--web-renderer` option. * Bump minimum Dart SDK version to `3.6.0` and minimum Flutter SDK version to `3.27.1`. * Bump `devtools_app_shared` dependency to `0.3.0`. * Bump `devtools_shared` dependency to `11.1.0`. -* Bump `vm_service` dependency to `>=13.0.0 <16.0.0`. * Clarify VS Code configuration in `README.md`. * Add "Supported Flutter versions" policy to the README. diff --git a/packages/devtools_extensions/pubspec.yaml b/packages/devtools_extensions/pubspec.yaml index 350175004a2..555a4716437 100644 --- a/packages/devtools_extensions/pubspec.yaml +++ b/packages/devtools_extensions/pubspec.yaml @@ -3,7 +3,7 @@ # 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.3.0 +version: 0.3.1 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_extensions From e2b02dd6e95fae487846ff5c11dab0686aff29e8 Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Fri, 31 Jan 2025 15:09:59 -0500 Subject: [PATCH 3/6] Bump Flutter version --- flutter-candidate.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flutter-candidate.txt b/flutter-candidate.txt index 97032a59174..0da4fc557e4 100644 --- a/flutter-candidate.txt +++ b/flutter-candidate.txt @@ -1 +1 @@ -7313c873463d2a20a7ec1047d7b8b9146dd2a39b +de872dd864518d436062354052ea8604c38e8c94 From e898c811e91b587d747e0c87c4260861f4260fa7 Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Fri, 31 Jan 2025 15:33:54 -0500 Subject: [PATCH 4/6] Fix analysis failure --- .../lib/src/screens/debugger/program_explorer_controller.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 632df8d7ac8..2e512c51d77 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 @@ -353,7 +353,8 @@ class ProgramExplorerController extends DisposableController ClassRef(:final location?) || FieldRef(:final location?) || FuncRef(:final location?) => location.script, - Code(:final function?) => function.location?.script, + Code(:final function?) when function is FuncRef => + function.location?.script, ScriptRef() => object, _ => null, }; From 6b57cb42712b8cc635020e2f1ef0bd10f060eae6 Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Fri, 31 Jan 2025 15:38:08 -0500 Subject: [PATCH 5/6] Address comments --- packages/devtools_app_shared/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devtools_app_shared/CHANGELOG.md b/packages/devtools_app_shared/CHANGELOG.md index be797c7e35c..94821aba3ad 100644 --- a/packages/devtools_app_shared/CHANGELOG.md +++ b/packages/devtools_app_shared/CHANGELOG.md @@ -4,7 +4,6 @@ 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.3.1 -* Add "Supported Flutter versions" policy to the README. * Bump `vm_service` dependency to `>=13.0.0 <16.0.0`. ## 0.3.0 @@ -14,6 +13,7 @@ found in the LICENSE file or at https://developers.google.com/open-source/licens * Add `DevToolsIcon` and `AssetImageIcon` widgets. * Add `iconAsset` and `iconSize` fields to the `ButtonGroupItemData` class. * Add `iconAsset` and `iconSize` fields to the `MaterialIconLabel` class. +* Add "Supported Flutter versions" policy to the README. ## 0.2.4 * Add `updateQueryParameter` utility method. From 06ed1f583ffe79e835cc19c097cc6649e26307db Mon Sep 17 00:00:00 2001 From: Ben Konyi Date: Fri, 31 Jan 2025 15:43:33 -0500 Subject: [PATCH 6/6] Fix quotes --- packages/devtools_app/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index 516aa2b1359..aae784efe11 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml @@ -52,7 +52,7 @@ dependencies: stack_trace: ^1.12.0 string_scanner: ^1.1.0 unified_analytics: ^7.0.0 - vm_service: ">=15.0.0 <16.0.0" + vm_service: '>=15.0.0 <16.0.0' vm_service_protos: ^1.0.0 vm_snapshot_analysis: ^0.7.6 web: ^1.0.0