diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a36d902cb8d..88e8f7d3d5d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -74,7 +74,7 @@ jobs: wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list sudo apt-get update - sudo apt-get install dcm=1.30.0-1 # To avoid errors add `-1` (build number) to the version + sudo apt-get install dcm=1.36.0-1 # To avoid errors add `-1` (build number) to the version sudo chmod +x /usr/bin/dcm echo "$(dcm --version)" - name: Setup Dart SDK diff --git a/flutter-candidate.txt b/flutter-candidate.txt index 366d50243d0..e630cfa35c0 100644 --- a/flutter-candidate.txt +++ b/flutter-candidate.txt @@ -1 +1 @@ -c6cec79f1f5d4ea1242936c7574af02bd39207c4 +49233d08009d7e3313da0bfbd859960d14d9c90c diff --git a/packages/devtools_app/benchmark/web_bundle_size_test.dart b/packages/devtools_app/benchmark/web_bundle_size_test.dart index 1e17beb7506..470d0c6144d 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:path/path.dart' as path; import 'package:test/test.dart'; // Benchmark size in kB. -const bundleSizeBenchmark = 5550; +const bundleSizeBenchmark = 5600; const gzipBundleSizeBenchmark = 1650; void main() { diff --git a/packages/devtools_app/lib/src/shared/console/eval/auto_complete.dart b/packages/devtools_app/lib/src/shared/console/eval/auto_complete.dart index 5cfc2aa3ab7..f0277067c3a 100644 --- a/packages/devtools_app/lib/src/shared/console/eval/auto_complete.dart +++ b/packages/devtools_app/lib/src/shared/console/eval/auto_complete.dart @@ -94,9 +94,7 @@ Future> autoCompleteResultsFor( } } catch (_) {} } - return result.nonNulls - .where((name) => name.startsWith(parts.activeWord)) - .toList(); + return result.where((name) => name.startsWith(parts.activeWord)).toList(); } // Due to https://github.com/dart-lang/sdk/issues/46221 @@ -197,7 +195,7 @@ Future> _libraryMemberAutocompletes( final members = functions.map( (funcRef) => funcRef.name!.replaceAll('=', ''), ); - result.addAll(members.nonNulls); + result.addAll(members); } final classes = library.classes; if (classes != null) { diff --git a/packages/devtools_app/test/test_infra/goldens/extensions/settings_state_modified.png b/packages/devtools_app/test/test_infra/goldens/extensions/settings_state_modified.png index 277d5487235..b1fde61d79f 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/extensions/settings_state_modified.png and b/packages/devtools_app/test/test_infra/goldens/extensions/settings_state_modified.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_profile_tab.png b/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_profile_tab.png index 97595ba6d0f..3faf47dd347 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_profile_tab.png and b/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_profile_tab.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_trace_tab.png b/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_trace_tab.png index 21eb64c9555..fa3a9ae162c 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_trace_tab.png and b/packages/devtools_app/test/test_infra/goldens/memory/load_offline_data_trace_tab.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_all.png b/packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_all.png index 60905aab4d4..bed044a359a 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_all.png and b/packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_all.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_five_minute.png b/packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_five_minute.png index 3207aaf60bf..34427a5fd71 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_five_minute.png and b/packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_five_minute.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png index 9b618a3ee36..a4790c896d8 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png and b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png index 9b618a3ee36..a4790c896d8 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png and b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_selected_class.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_selected_class.png index 5f17de55bc4..08d43ff0975 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_diff_selected_class.png and b/packages/devtools_app/test/test_infra/goldens/memory_diff_selected_class.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_diff.png index d2cc323afcc..b1252572ff8 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_diff.png and b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_diff.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_single.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_single.png index a3bcbb48009..61a2fd22eb3 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_single.png and b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_single.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_diff.png index d2cc323afcc..b1252572ff8 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_diff.png and b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_diff.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_single.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_single.png index a3bcbb48009..61a2fd22eb3 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_single.png and b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_single.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_diff.png index d2cc323afcc..b1252572ff8 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_diff.png and b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_diff.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_single.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_single.png index a3bcbb48009..61a2fd22eb3 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_single.png and b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_single.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots1.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots1.png index 5f17de55bc4..08d43ff0975 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots1.png and b/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots1.png differ diff --git a/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots2.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots2.png index 5f17de55bc4..08d43ff0975 100644 Binary files a/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots2.png and b/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots2.png differ diff --git a/packages/devtools_shared/lib/src/extensions/extension_model.dart b/packages/devtools_shared/lib/src/extensions/extension_model.dart index 39d480638cd..e1630dec524 100644 --- a/packages/devtools_shared/lib/src/extensions/extension_model.dart +++ b/packages/devtools_shared/lib/src/extensions/extension_model.dart @@ -39,7 +39,6 @@ class DevToolsExtensionConfig implements Comparable { nameKey: final String name, issueTrackerKey: final String issueTracker, versionKey: final String version, - // ignore: avoid-unnecessary-type-assertions, this can be a String or an int materialIconCodePointKey: final Object codePointFromJson, // The expected keys below are not from the extension's config.yaml // file; they are generated during the extension detection mechanism diff --git a/pubspec.lock b/pubspec.lock index d88cd7991eb..0bd580b73d5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -790,10 +790,10 @@ packages: dependency: transitive description: name: sse - sha256: fcc97470240bb37377f298e2bd816f09fd7216c07928641c0560719f50603643 + sha256: a9a804dbde8bfd369da3b4aa241d44d63a6486a97388c54ec166073d88c52302 url: "https://pub.dev" source: hosted - version: "4.1.8" + version: "4.2.0" stack_trace: dependency: transitive description: @@ -854,26 +854,26 @@ packages: dependency: transitive description: name: test - sha256: "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7" + sha256: "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20" url: "https://pub.dev" source: hosted - version: "1.30.0" + version: "1.31.0" test_api: dependency: transitive description: name: test_api - sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.11" test_core: dependency: transitive description: name: test_core - sha256: "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51" + sha256: "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34" url: "https://pub.dev" source: hosted - version: "0.6.16" + version: "0.6.17" typed_data: dependency: transitive description: @@ -1067,5 +1067,5 @@ packages: source: hosted version: "2.2.4" sdks: - dart: ">=3.10.0 <4.0.0" + dart: ">=3.11.0 <4.0.0" flutter: ">=3.38.0"