Bump devtools_shared vm_service dep to 12.0.0 (#6521)
diff --git a/packages/devtools_app/lib/src/screens/memory/panes/leaks/diagnostics/formatter.dart b/packages/devtools_app/lib/src/screens/memory/panes/leaks/diagnostics/formatter.dart index c6d8c54..2c21ffd 100644 --- a/packages/devtools_app/lib/src/screens/memory/panes/leaks/diagnostics/formatter.dart +++ b/packages/devtools_app/lib/src/screens/memory/panes/leaks/diagnostics/formatter.dart
@@ -16,9 +16,9 @@ }) { return '# For memory leaks troubleshooting tips see\n' '# $linkToGuidance\n\n' - '${LeakReport.iterableToYaml('not-disposed', notDisposed)}' + '${LeakReport.iterableToYaml('not-disposed', notDisposed, phasesAreTests: false)}' '${_notGCedToYaml(notGCed)}' - '${LeakReport.iterableToYaml('gced-late', gcedLate)}'; + '${LeakReport.iterableToYaml('gced-late', gcedLate, phasesAreTests: false)}'; } String _notGCedToYaml(NotGCedAnalyzed? notGCed) { @@ -54,6 +54,7 @@ LeakReport.iterableToYaml( 'not-gced-without-path', notGCed.leaksWithoutRetainingPath, + phasesAreTests: false, ), ); @@ -65,11 +66,11 @@ 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()}'''; }
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 8a02a14..b0eb257 100644 --- a/packages/devtools_app/lib/src/service/vm_service_wrapper.dart +++ b/packages/devtools_app/lib/src/service/vm_service_wrapper.dart
@@ -380,6 +380,7 @@ bool? forceCompile, bool? reportLines, List<String>? libraryFilters, + List<String>? librariesAlreadyCompiled, }) async { return trackFuture( 'getSourceReport', @@ -392,6 +393,7 @@ forceCompile: forceCompile, reportLines: reportLines, libraryFilters: libraryFilters, + librariesAlreadyCompiled: librariesAlreadyCompiled, ), ); }
diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index 537d4b5..3b63b7c 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml
@@ -27,7 +27,7 @@ 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 @@ -43,10 +43,10 @@ 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 @@ -63,7 +63,7 @@ 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
diff --git a/packages/devtools_app_shared/pubspec.yaml b/packages/devtools_app_shared/pubspec.yaml index 951f441..99a86f7 100644 --- a/packages/devtools_app_shared/pubspec.yaml +++ b/packages/devtools_app_shared/pubspec.yaml
@@ -9,13 +9,13 @@ 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
diff --git a/packages/devtools_extensions/pubspec.yaml b/packages/devtools_extensions/pubspec.yaml index 23ff1e8..81d4155 100644 --- a/packages/devtools_extensions/pubspec.yaml +++ b/packages/devtools_extensions/pubspec.yaml
@@ -13,14 +13,14 @@ 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:
diff --git a/packages/devtools_shared/CHANGELOG.md b/packages/devtools_shared/CHANGELOG.md index 800cfa1..e232c53 100644 --- a/packages/devtools_shared/CHANGELOG.md +++ b/packages/devtools_shared/CHANGELOG.md
@@ -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.
diff --git a/packages/devtools_shared/pubspec.yaml b/packages/devtools_shared/pubspec.yaml index 2847eb8..4ad81e6 100644 --- a/packages/devtools_shared/pubspec.yaml +++ b/packages/devtools_shared/pubspec.yaml
@@ -1,7 +1,7 @@ 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 @@ -9,6 +9,7 @@ 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 @@ -16,7 +17,7 @@ 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
diff --git a/packages/devtools_test/lib/src/mocks/fake_vm_service_wrapper.dart b/packages/devtools_test/lib/src/mocks/fake_vm_service_wrapper.dart index 76f9ec5..5ca526b 100644 --- a/packages/devtools_test/lib/src/mocks/fake_vm_service_wrapper.dart +++ b/packages/devtools_test/lib/src/mocks/fake_vm_service_wrapper.dart
@@ -459,6 +459,7 @@ bool? forceCompile, bool? reportLines, List<String>? libraryFilters, + List<String>? librariesAlreadyCompiled, }) async { return SourceReport(ranges: [], scripts: []); }
diff --git a/packages/devtools_test/pubspec.yaml b/packages/devtools_test/pubspec.yaml index 7fe14f8..ce87489 100644 --- a/packages/devtools_test/pubspec.yaml +++ b/packages/devtools_test/pubspec.yaml
@@ -18,7 +18,7 @@ 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 @@ -30,7 +30,7 @@ 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'