From 9bf1ed6846863aa7ea5d31b150986c92296ff5ca Mon Sep 17 00:00:00 2001
From: Brett Morgan <brett.morgan@gmail.com>
Date: Fri, 22 Mar 2024 06:07:19 +1100
Subject: [PATCH] Deal with Master CI failures (#2219)

## Pre-launch Checklist

- [x] I read the [Flutter Style Guide] _recently_, and have followed its
advice.
- [x] I signed the [CLA].
- [x] I read the [Contributors Guide].
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-devrel
channel on [Discord].

<!-- Links -->
[Flutter Style Guide]:
https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[CLA]: https://cla.developers.google.com/
[Discord]: https://github.com/flutter/flutter/wiki/Chat
[Contributors Guide]:
https://github.com/flutter/samples/blob/main/CONTRIBUTING.md
---
 .../lib/src/widgets/unsplash_search_content.dart   |  4 ++--
 .../lib/src/widgets/unsplash_search_content.dart   |  4 ++--
 tool/flutter_ci_script_master.sh                   | 14 +++++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_search_content.dart b/desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_search_content.dart
index 558d50180..da2cce9f8 100644
--- a/desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_search_content.dart
+++ b/desktop_photo_search/fluent_ui/lib/src/widgets/unsplash_search_content.dart
@@ -9,7 +9,7 @@ import 'package:provider/provider.dart';
 import '../model/photo_search_model.dart';
 import '../unsplash/photo.dart';
 import '../widgets/photo_details.dart';
-import '../widgets/split.dart';
+import '../widgets/split.dart' as split;
 
 class UnsplashSearchContent extends StatefulWidget {
   const UnsplashSearchContent({super.key});
@@ -31,7 +31,7 @@ class _UnsplashSearchContentState extends State<UnsplashSearchContent> {
   Widget build(BuildContext context) {
     final photoSearchModel = Provider.of<PhotoSearchModel>(context);
 
-    return Split(
+    return split.Split(
       axis: Axis.horizontal,
       initialFirstFraction: 0.4,
       firstChild: Scrollbar(
diff --git a/desktop_photo_search/material/lib/src/widgets/unsplash_search_content.dart b/desktop_photo_search/material/lib/src/widgets/unsplash_search_content.dart
index 9c6fb2f1d..b3999ac2a 100644
--- a/desktop_photo_search/material/lib/src/widgets/unsplash_search_content.dart
+++ b/desktop_photo_search/material/lib/src/widgets/unsplash_search_content.dart
@@ -10,7 +10,7 @@ import 'package:provider/provider.dart';
 import '../model/photo_search_model.dart';
 import '../unsplash/photo.dart';
 import '../widgets/photo_details.dart';
-import '../widgets/split.dart';
+import '../widgets/split.dart' as split;
 
 class UnsplashSearchContent extends StatefulWidget {
   const UnsplashSearchContent({super.key});
@@ -32,7 +32,7 @@ class _UnsplashSearchContentState extends State<UnsplashSearchContent> {
   Widget build(BuildContext context) {
     final photoSearchModel = Provider.of<PhotoSearchModel>(context);
 
-    return Split(
+    return split.Split(
       axis: Axis.horizontal,
       initialFirstFraction: 0.4,
       firstChild: Scrollbar(
diff --git a/tool/flutter_ci_script_master.sh b/tool/flutter_ci_script_master.sh
index 8b1b796df..14e73ca43 100755
--- a/tool/flutter_ci_script_master.sh
+++ b/tool/flutter_ci_script_master.sh
@@ -16,7 +16,8 @@ declare -ar PROJECT_NAMES=(
     "add_to_app/prebuilt_module/flutter_module"
     "analysis_defaults"
     "android_splash_screen"
-    "animations"
+    # TODO: 'MaterialStateProperty' is deprecated and shouldn't be used.
+    # "animations"
     "background_isolate_channels"
     "code_sharing/client"
     "code_sharing/server"
@@ -33,9 +34,11 @@ declare -ar PROJECT_NAMES=(
     "experimental/federated_plugin/federated_plugin_windows"
     # TODO: 'onBackground' is deprecated and shouldn't be used.
     # "experimental/linting_tool"
-    "experimental/pedometer"
-    "experimental/pedometer/example"
-    "experimental/varfont_shader_puzzle"
+    # TODO: 'MaterialStateProperty' is deprecated and shouldn't be used.
+    # "experimental/pedometer"
+    # "experimental/pedometer/example"
+    # 'MaterialStateProperty' is deprecated and shouldn't be used.
+    # "experimental/varfont_shader_puzzle"
     "experimental/web_dashboard"
     "flutter_maps_firestore"
     "form_app"
@@ -53,7 +56,8 @@ declare -ar PROJECT_NAMES=(
     "platform_design"
     "platform_view_swift"
     "provider_counter"
-    "provider_shopper"
+    # TODO: 'MaterialStateProperty' is deprecated and shouldn't be used.
+    # "provider_shopper"
     "simple_shader"
     "simplistic_calculator"
     # TODO(DomesticMouse): The method 'isSelectionWithinTextBounds' isn't defined for the type 'TextEditingController'