diff --git a/flutter-candidate.txt b/flutter-candidate.txt index b8f91c90920..f32407a8bbe 100644 --- a/flutter-candidate.txt +++ b/flutter-candidate.txt @@ -1 +1 @@ -71348e7b2b1b64e425fa0a3733f27d2b94ca7847 +5f49837cddf55149ed9af642a80a2bb45b0149ec diff --git a/packages/devtools_app/benchmark/web_bundle_size_test.dart b/packages/devtools_app/benchmark/web_bundle_size_test.dart index ac5a8a053ba..1e17beb7506 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 = 5500; +const bundleSizeBenchmark = 5550; const gzipBundleSizeBenchmark = 1650; void main() { diff --git a/packages/devtools_app/lib/devtools.dart b/packages/devtools_app/lib/devtools.dart index 6ac7b74484f..15fcb1db426 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.55.0-dev.0'; +const version = '2.55.0'; diff --git a/packages/devtools_app/lib/src/shared/primitives/custom_pointer_scroll_view.dart b/packages/devtools_app/lib/src/shared/primitives/custom_pointer_scroll_view.dart index eb0e45f5d2a..f6cc1b52de7 100644 --- a/packages/devtools_app/lib/src/shared/primitives/custom_pointer_scroll_view.dart +++ b/packages/devtools_app/lib/src/shared/primitives/custom_pointer_scroll_view.dart @@ -31,7 +31,7 @@ abstract class CustomPointerScrollView extends BoxScrollView { super.physics, super.shrinkWrap, super.padding, - super.cacheExtent, + super.scrollCacheExtent, super.semanticChildCount, super.dragStartBehavior, this.customPointerSignalHandler, diff --git a/packages/devtools_app/pubspec.yaml b/packages/devtools_app/pubspec.yaml index ebd08878b16..90fdb879651 100644 --- a/packages/devtools_app/pubspec.yaml +++ b/packages/devtools_app/pubspec.yaml @@ -7,7 +7,7 @@ publish_to: none # 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.55.0-dev.0 +version: 2.55.0 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app @@ -36,7 +36,7 @@ dependencies: flutter_web_plugins: sdk: flutter http: ^1.1.0 - image: ^4.1.3 + image: ^4.7.2 intl: ^0.19.0 json_rpc_2: ^3.0.2 logging: ^1.1.1 diff --git a/pubspec.lock b/pubspec.lock index 7127d25f17d..180e37affda 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -437,10 +437,10 @@ packages: dependency: transitive description: name: image - sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928" + sha256: "492bd52f6c4fbb6ee41f781ff27765ce5f627910e1e0cbecfa3d9add5562604c" url: "https://pub.dev" source: hosted - version: "4.5.4" + version: "4.7.2" integration_test: dependency: transitive description: flutter @@ -546,10 +546,10 @@ packages: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" mime: dependency: transitive description: @@ -854,26 +854,26 @@ packages: dependency: transitive description: name: test - sha256: "77cc98ea27006c84e71a7356cf3daf9ddbde2d91d84f77dbfe64cf0e4d9611ae" + sha256: "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a" url: "https://pub.dev" source: hosted - version: "1.28.0" + version: "1.29.0" test_api: dependency: transitive description: name: test_api - sha256: "19a78f63e83d3a61f00826d09bc2f60e191bf3504183c001262be6ac75589fb8" + sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636" url: "https://pub.dev" source: hosted - version: "0.7.8" + version: "0.7.9" test_core: dependency: transitive description: name: test_core - sha256: f1072617a6657e5fc09662e721307f7fb009b4ed89b19f47175d11d5254a62d4 + sha256: "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943" url: "https://pub.dev" source: hosted - version: "0.6.14" + version: "0.6.15" typed_data: dependency: transitive description: