Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ String analyzedLeaksToYaml({
}) {
return '# For memory leaks troubleshooting tips see\n'
'# $linkToGuidance\n\n'
'${LeakReport.iterableToYaml('not-disposed', notDisposed)}'
'${LeakReport.iterableToYaml('not-disposed', notDisposed, phasesAreTests: false)}'
Comment thread
polina-c marked this conversation as resolved.
'${_notGCedToYaml(notGCed)}'
'${LeakReport.iterableToYaml('gced-late', gcedLate)}';
'${LeakReport.iterableToYaml('gced-late', gcedLate, phasesAreTests: false)}';
}

String _notGCedToYaml(NotGCedAnalyzed? notGCed) {
Expand Down Expand Up @@ -54,6 +54,7 @@ String _notGCedToYaml(NotGCedAnalyzed? notGCed) {
LeakReport.iterableToYaml(
'not-gced-without-path',
notGCed.leaksWithoutRetainingPath,
phasesAreTests: false,
),
);

Expand All @@ -65,11 +66,11 @@ String _culpritToYaml(
List<LeakReport> victims, {
String indent = '',
}) {
final culpritYaml = culprit.toYaml(indent);
final culpritYaml = culprit.toYaml(indent, phasesAreTests: false);
if (victims.isEmpty) return culpritYaml;

return '$culpritYaml'
'''$indent total-victims: ${victims.length}
$indent victims:
${victims.map((e) => e.toYaml('$indent ')).join()}''';
${victims.map((e) => e.toYaml('$indent ', phasesAreTests: false)).join()}''';
}
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ class VmServiceWrapper implements VmService {
bool? forceCompile,
bool? reportLines,
List<String>? libraryFilters,
List<String>? librariesAlreadyCompiled,
}) async {
return trackFuture(
'getSourceReport',
Expand All @@ -392,6 +393,7 @@ class VmServiceWrapper implements VmService {
forceCompile: forceCompile,
reportLines: reportLines,
libraryFilters: libraryFilters,
librariesAlreadyCompiled: librariesAlreadyCompiled,
),
);
}
Expand Down
8 changes: 4 additions & 4 deletions packages/devtools_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies:
dds_service_extensions: ^1.6.0
devtools_app_shared: ^0.0.5
devtools_extensions: ^0.0.9
devtools_shared: ^4.0.1
devtools_shared: ^4.1.0
file: ">=6.0.0 <8.0.0"
file_selector: ^0.8.0
file_selector_linux: ^0.0.2
Expand All @@ -43,10 +43,10 @@ dependencies:
sdk: flutter
http: ^0.13.4
image: ^3.0.2
intl: ">=0.16.1 <0.18.0"
intl: ">=0.16.1 <=0.18.0"
js: ^0.6.1+1
json_rpc_2: ^3.0.2
leak_tracker: 2.0.1
leak_tracker: 9.0.8
logging: ^1.1.1
meta: ^1.9.1
mime: ^1.0.0
Expand All @@ -63,7 +63,7 @@ dependencies:
string_scanner: ^1.1.0
url_launcher: ^6.1.0
url_launcher_web: ^2.0.6
vm_service: ^11.10.0
vm_service: ^12.0.0
# TODO https://github.com/dart-lang/sdk/issues/52853 - unpin this version
vm_snapshot_analysis: 0.7.2
web_socket_channel: ^2.1.0
Expand Down
4 changes: 2 additions & 2 deletions packages/devtools_app_shared/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ environment:

dependencies:
collection: ^1.15.0
devtools_shared: ^4.0.1
devtools_shared: ^4.1.0
flutter:
sdk: flutter
logging: ^1.1.1
meta: ^1.9.1
pointer_interceptor: ^0.9.3+3
vm_service: ^11.10.0
vm_service: ^12.0.0

dev_dependencies:
flutter_lints: ^2.0.3
Expand Down
4 changes: 2 additions & 2 deletions packages/devtools_extensions/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ executables:

dependencies:
args: ^2.4.2
devtools_shared: ^4.0.1
devtools_shared: ^4.1.0
devtools_app_shared: ^0.0.5
flutter:
sdk: flutter
io: ^1.0.4
path: ^1.8.0
logging: ^1.1.1
vm_service: ^11.10.0
vm_service: ^12.0.0

dev_dependencies:
flutter_driver:
Expand Down
7 changes: 2 additions & 5 deletions packages/devtools_shared/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
# 4.2.0

# 4.1.0
- Bump `package:vm_service` to ^12.0.0.
- Adds `DeeplinkApi.androidAppLinkSettings`, `DeeplinkApi.iosBuildOptions`, and
`DeeplinkApi.iosUniversalLinkSettings` endpoints to ServerApi.

# 4.1.0

- Add shared integration test utilities to `package:devtools_shared`. These test
utilities are exported as part of the existing `devtools_test_utils.dart` library.

Expand Down
5 changes: 3 additions & 2 deletions packages/devtools_shared/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
name: devtools_shared
description: Package of shared Dart structures between devtools_app, dds, and other tools.

version: 4.2.0
version: 4.1.0

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

environment:
sdk: '>=3.0.0 <4.0.0'

dependencies:
args: ^2.4.2
collection: ^1.15.0
extension_discovery: ^2.0.0
meta: ^1.9.1
path: ^1.8.0
shelf: ^1.1.0
sse: ^4.1.2
usage: ^4.0.0
vm_service: ^11.10.0
vm_service: ^12.0.0
web_socket_channel: ^2.4.0
webkit_inspection_protocol: ">=0.5.0 <2.0.0"
yaml: ^3.1.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ class FakeVmServiceWrapper extends Fake implements VmServiceWrapper {
bool? forceCompile,
bool? reportLines,
List<String>? libraryFilters,
List<String>? librariesAlreadyCompiled,
}) async {
return SourceReport(ranges: [], scripts: []);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/devtools_test/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ environment:
dependencies:
async: ^2.0.0
collection: ^1.15.0
devtools_shared: ^4.0.1
devtools_shared: ^4.1.0
devtools_app: 2.28.1
devtools_app_shared:
path: ../devtools_app_shared
Expand All @@ -30,7 +30,7 @@ dependencies:
mockito: ^5.4.1
path: ^1.8.0
provider: ^6.0.2
vm_service: ^11.10.0
vm_service: ^12.0.0
vm_snapshot_analysis: ^0.7.1
webkit_inspection_protocol: '>=0.5.0 <2.0.0'

Expand Down