From 38e19d01dcac654bbb941b771cc06efd4ed4a93f Mon Sep 17 00:00:00 2001 From: Camille Simon <43054281+camsim99@users.noreply.github.com> Date: Fri, 9 May 2025 09:48:01 -0700 Subject: [PATCH] Update Dart revision to `3.8.0-278.4.beta` (#168391) * Updated Dart revision to [`e7f2f0556e3e57acb60749467e54f9a44b2bfc76`](http://goto.google.com/dart-hash/e7f2f0556e3e57acb60749467e54f9a44b2bfc76) (`3.8.0-278.4.beta`). * ~Ran `gclient sync -D` and `tools/dart/create_updated_flutter_deps.py` (nothing was updated)~ ran wrong command * Ran `gclient sync -D` and `tools/dart/create_updated_flutter_deps.py -f ` (Dart style revision was updated) --- DEPS | 4 +- .../flutter/ci/licenses_golden/licenses_dart | 4 +- .../src/widget_preview_rendering.dart.tmpl | 37 ++++++++----------- .../lib/src/widget_preview_rendering.dart | 37 ++++++++----------- 4 files changed, 34 insertions(+), 48 deletions(-) diff --git a/DEPS b/DEPS index ecb4b3edfb..4d20390ae3 100644 --- a/DEPS +++ b/DEPS @@ -56,7 +56,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '9003f7927a24fd87c34154e04585bfbcfd4d9188', + 'dart_revision': 'e7f2f0556e3e57acb60749467e54f9a44b2bfc76', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -314,7 +314,7 @@ deps = { Var('dart_git') + '/core.git' + '@' + Var('dart_core_rev'), 'engine/src/flutter/third_party/dart/third_party/pkg/dart_style': - Var('dart_git') + '/dart_style.git@21de99ec0ff8ace4d946a746fb427fffd6afa535', + Var('dart_git') + '/dart_style.git@100db45075abdd66fd8788b205243e90ff0595df', 'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc': Var('dart_git') + '/dartdoc.git@62aefbb788baf5b73b2d704d66d9735a7ca56a69', diff --git a/engine/src/flutter/ci/licenses_golden/licenses_dart b/engine/src/flutter/ci/licenses_golden/licenses_dart index 0e14926dad..0a67c1ebb3 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_dart +++ b/engine/src/flutter/ci/licenses_golden/licenses_dart @@ -1,4 +1,4 @@ -Signature: e41496825525b0b25bd65a5a8e93c81a +Signature: f4f0a7ce457a816a7b8e0f13355125f4 ==================================================================================================== LIBRARY: dart @@ -4858,7 +4858,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. -You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/0d6811928830b87e36a0f49eb7fe554c308d3699 +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/e7f2f0556e3e57acb60749467e54f9a44b2bfc76 /third_party/fallback_root_certificates/ ==================================================================================================== diff --git a/packages/flutter_tools/templates/widget_preview_scaffold/lib/src/widget_preview_rendering.dart.tmpl b/packages/flutter_tools/templates/widget_preview_scaffold/lib/src/widget_preview_rendering.dart.tmpl index 8449dd0ec5..3e26bb2d4e 100644 --- a/packages/flutter_tools/templates/widget_preview_scaffold/lib/src/widget_preview_rendering.dart.tmpl +++ b/packages/flutter_tools/templates/widget_preview_scaffold/lib/src/widget_preview_rendering.dart.tmpl @@ -96,11 +96,10 @@ class _WidgetPreviewErrorWidget extends StatelessWidget { TextSpan( text: frame.location, style: linkTextStyle, - recognizer: - TapGestureRecognizer() - ..onTap = () { - // TODO(bkonyi): notify IDEs to navigate to the source location via DTD. - }, + recognizer: TapGestureRecognizer() + ..onTap = () { + // TODO(bkonyi): notify IDEs to navigate to the source location via DTD. + }, ), TextSpan(text: ' ' * (longest - frame.location.length)), const TextSpan(text: ' '), @@ -244,11 +243,8 @@ class WidgetPreviewerWindowConstraints extends InheritedWidget { final BoxConstraints constraints; static BoxConstraints getRootConstraints(BuildContext context) { - final result = - context - .dependOnInheritedWidgetOfExactType< - WidgetPreviewerWindowConstraints - >(); + final result = context + .dependOnInheritedWidgetOfExactType(); assert( result != null, 'No WidgetPreviewerWindowConstraints founds in context', @@ -348,10 +344,9 @@ class _WidgetPreviewWrapperBox extends RenderShiftedBox { // the previewer. In this case, apply finite constraints (e.g., the // constraints for the root of the previewer). Otherwise, use the // widget's actual constraints. - _constraintOverride = - minInstrinsicHeight == 0 - ? _previewerConstraints - : const BoxConstraints(); + _constraintOverride = minInstrinsicHeight == 0 + ? _previewerConstraints + : const BoxConstraints(); } super.layout(constraints, parentUsesSize: parentUsesSize); } @@ -483,18 +478,16 @@ class _WidgetPreviewScaffold extends StatelessWidget { IconButton( onPressed: () => _toggleLayout(LayoutType.gridView), icon: Icon(Icons.grid_on), - color: - selectedLayout == LayoutType.gridView - ? Colors.blue - : Colors.black, + color: selectedLayout == LayoutType.gridView + ? Colors.blue + : Colors.black, ), IconButton( onPressed: () => _toggleLayout(LayoutType.listView), icon: Icon(Icons.view_list), - color: - selectedLayout == LayoutType.listView - ? Colors.blue - : Colors.black, + color: selectedLayout == LayoutType.listView + ? Colors.blue + : Colors.black, ), ], ); diff --git a/packages/flutter_tools/test/widget_preview_scaffold.shard/widget_preview_scaffold/lib/src/widget_preview_rendering.dart b/packages/flutter_tools/test/widget_preview_scaffold.shard/widget_preview_scaffold/lib/src/widget_preview_rendering.dart index 8449dd0ec5..3e26bb2d4e 100644 --- a/packages/flutter_tools/test/widget_preview_scaffold.shard/widget_preview_scaffold/lib/src/widget_preview_rendering.dart +++ b/packages/flutter_tools/test/widget_preview_scaffold.shard/widget_preview_scaffold/lib/src/widget_preview_rendering.dart @@ -96,11 +96,10 @@ class _WidgetPreviewErrorWidget extends StatelessWidget { TextSpan( text: frame.location, style: linkTextStyle, - recognizer: - TapGestureRecognizer() - ..onTap = () { - // TODO(bkonyi): notify IDEs to navigate to the source location via DTD. - }, + recognizer: TapGestureRecognizer() + ..onTap = () { + // TODO(bkonyi): notify IDEs to navigate to the source location via DTD. + }, ), TextSpan(text: ' ' * (longest - frame.location.length)), const TextSpan(text: ' '), @@ -244,11 +243,8 @@ class WidgetPreviewerWindowConstraints extends InheritedWidget { final BoxConstraints constraints; static BoxConstraints getRootConstraints(BuildContext context) { - final result = - context - .dependOnInheritedWidgetOfExactType< - WidgetPreviewerWindowConstraints - >(); + final result = context + .dependOnInheritedWidgetOfExactType(); assert( result != null, 'No WidgetPreviewerWindowConstraints founds in context', @@ -348,10 +344,9 @@ class _WidgetPreviewWrapperBox extends RenderShiftedBox { // the previewer. In this case, apply finite constraints (e.g., the // constraints for the root of the previewer). Otherwise, use the // widget's actual constraints. - _constraintOverride = - minInstrinsicHeight == 0 - ? _previewerConstraints - : const BoxConstraints(); + _constraintOverride = minInstrinsicHeight == 0 + ? _previewerConstraints + : const BoxConstraints(); } super.layout(constraints, parentUsesSize: parentUsesSize); } @@ -483,18 +478,16 @@ class _WidgetPreviewScaffold extends StatelessWidget { IconButton( onPressed: () => _toggleLayout(LayoutType.gridView), icon: Icon(Icons.grid_on), - color: - selectedLayout == LayoutType.gridView - ? Colors.blue - : Colors.black, + color: selectedLayout == LayoutType.gridView + ? Colors.blue + : Colors.black, ), IconButton( onPressed: () => _toggleLayout(LayoutType.listView), icon: Icon(Icons.view_list), - color: - selectedLayout == LayoutType.listView - ? Colors.blue - : Colors.black, + color: selectedLayout == LayoutType.listView + ? Colors.blue + : Colors.black, ), ], );