[hhh] Patch flutter so it is compatible with latest analyzer
Change-Id: I70b9cdb0609e063fa9b0ce1e4a89dac24f87fad9
Reviewed-on: https://dart-review.googlesource.com/c/85730
Reviewed-by: Paul Berry <paulberry@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
diff --git a/tools/patches/flutter-engine/f9ebf2129732fd2b606286fdf58e500384b8a0bc.flutter.patch b/tools/patches/flutter-engine/f9ebf2129732fd2b606286fdf58e500384b8a0bc.flutter.patch
index e4dcd66..7e5352b 100644
--- a/tools/patches/flutter-engine/f9ebf2129732fd2b606286fdf58e500384b8a0bc.flutter.patch
+++ b/tools/patches/flutter-engine/f9ebf2129732fd2b606286fdf58e500384b8a0bc.flutter.patch
@@ -1,5 +1,17 @@
+diff --git a/analysis_options.yaml b/analysis_options.yaml
+index 8957dfe03..68eea153e 100644
+--- a/analysis_options.yaml
++++ b/analysis_options.yaml
+@@ -114,7 +114,6 @@ linter:
+ # - parameter_assignments # we do this commonly
+ - prefer_adjacent_string_concatenation
+ - prefer_asserts_in_initializer_lists
+- - prefer_bool_in_asserts
+ - prefer_collection_literals
+ - prefer_conditional_assignment
+ - prefer_const_constructors
diff --git a/dev/devicelab/pubspec.yaml b/dev/devicelab/pubspec.yaml
-index 9dee6de4a12..8063988556d 100644
+index 9dee6de4a..806398855 100644
--- a/dev/devicelab/pubspec.yaml
+++ b/dev/devicelab/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/flutter/flutter
@@ -12,7 +24,7 @@
dependencies:
args: 1.5.1
diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml
-index 81564e6a2b4..9f85ed7ab4d 100644
+index 81564e6a2..9f85ed7ab 100644
--- a/packages/flutter/pubspec.yaml
+++ b/packages/flutter/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: http://flutter.io
@@ -25,7 +37,7 @@
dependencies:
# To update these, use "flutter update-packages --force-upgrade".
diff --git a/packages/flutter_test/pubspec.yaml b/packages/flutter_test/pubspec.yaml
-index aa930cbdf49..531d24b7187 100644
+index aa930cbdf..531d24b71 100644
--- a/packages/flutter_test/pubspec.yaml
+++ b/packages/flutter_test/pubspec.yaml
@@ -2,7 +2,7 @@ name: flutter_test
@@ -38,7 +50,7 @@
dependencies:
# To update these, use "flutter update-packages --force-upgrade".
diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml
-index 5f89d0f18ea..a869162b0e8 100644
+index 5f89d0f18..a869162b0 100644
--- a/packages/flutter_tools/pubspec.yaml
+++ b/packages/flutter_tools/pubspec.yaml
@@ -5,7 +5,7 @@ author: Flutter Authors <flutter-dev@googlegroups.com>
