From 96f870ecbf3128ec702c98ff519afc76bfeadf17 Mon Sep 17 00:00:00 2001
From: David Iglesias <ditman@gmail.com>
Date: Fri, 12 Jul 2024 19:04:31 -0700
Subject: [PATCH] Manual roll Flutter to 58068d8ea4ec (42 revisions) (#7099)

This PR attempts to roll the `master` version of Flutter with a small CI tweak.

## [ci] Configures split `all_packages` build

Continuing https://github.com/flutter/packages/pull/7106:

* Makes android_build_all_packages build with JDK17 only, and only a JDK17 project.
* Gets android_build_all_packages_legacy out of bringup.

This should resolve the [gradle issues](https://github.com/flutter/packages/pull/7098/checks?check_run_id=27296340933) of the "all_packages" app with the latest version of Flutter.

## Manual roll Flutter from 5103d7574361 to 58068d8ea4ec (42 revisions)

Same as this roll triggered by the roller:

* https://github.com/flutter/packages/pull/7110
---
 .ci.yaml                                    | 25 +++----------------
 .ci/flutter_master.version                  |  2 +-
 .ci/targets/android_build_all_packages.yaml | 27 ---------------------
 3 files changed, 5 insertions(+), 49 deletions(-)
 delete mode 100644 .ci/targets/android_build_all_packages.yaml

diff --git a/.ci.yaml b/.ci.yaml
index 968e4adaedbc..44f91b188c17 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -364,23 +364,15 @@ targets:
     timeout: 30
     properties:
       version_file: flutter_master.version
-      target_file: android_build_all_packages.yaml
+      # This builds the all_packages app only in a current JDK.
+      target_file: android_build_all_packages_jdk17.yaml
       channel: master
-      # The legacy project build requires an older JDK.
-      dependencies: >-
-        [
-          {"dependency": "open_jdk", "version": "version:11"}
-        ]
       env_variables: >-
         {
           "CHANNEL": "master"
         }
 
   - name: Linux_android android_build_all_packages_legacy master
-    # When making this `bringup: false`, update the task above to
-    # use target_file: android_build_all_packages_jdk17.yaml and
-    # remove its 'dependencies' section.
-    bringup: true # https://github.com/flutter/packages/pull/7099
     recipe: packages/packages
     timeout: 30
     properties:
@@ -407,24 +399,15 @@ targets:
     properties:
       add_recipes_cq: "true"
       version_file: flutter_stable.version
-      # This builds both legacy, and "modern" projects.
-      target_file: android_build_all_packages.yaml
+      # This builds the all_packages app only in a current JDK.
+      target_file: android_build_all_packages_jdk17.yaml
       channel: stable
-      # The legacy project build requires an older JDK.
-      dependencies: >-
-        [
-          {"dependency": "open_jdk", "version": "version:11"}
-        ]
       env_variables: >-
         {
           "CHANNEL": "stable"
         }
 
   - name: Linux_android android_build_all_packages_legacy stable
-    # When making this `bringup: false`, update the task above to
-    # use target_file: android_build_all_packages_jdk17.yaml and
-    # remove its 'dependencies' section.
-    bringup: true # https://github.com/flutter/packages/pull/7099
     recipe: packages/packages
     timeout: 30
     properties:
diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
index 1d67e407f8ec..240de1f12163 100644
--- a/.ci/flutter_master.version
+++ b/.ci/flutter_master.version
@@ -1 +1 @@
-5103d757436124a08e6a8024ebacbf0cf4b2bacf
+58068d8ea4eca8a17d99469697aaff46255522e9
diff --git a/.ci/targets/android_build_all_packages.yaml b/.ci/targets/android_build_all_packages.yaml
deleted file mode 100644
index 64a02e8a6a26..000000000000
--- a/.ci/targets/android_build_all_packages.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# This builds legacy and modern all_packages app, which requires jdk11
-# This will stop working in the next stable!
-tasks:
-  - name: prepare tool
-    script: .ci/scripts/prepare_tool.sh
-    infra_step: true # Note infra steps failing prevents "always" from running.
-  - name: create all_packages app
-    script: .ci/scripts/create_all_packages_app.sh
-    infra_step: true # Note infra steps failing prevents "always" from running.
-  - name: build all_packages for Android debug
-    script: .ci/scripts/build_all_packages_app.sh
-    args: ["apk", "debug"]
-  - name: build all_packages for Android release
-    script: .ci/scripts/build_all_packages_app.sh
-    args: ["apk", "release"]
-  - name: create all_packages app - legacy version
-    script: .ci/scripts/create_all_packages_app_legacy.sh
-    # Output dir; must match the final argument to build_all_packages_app_legacy
-    # below.
-    args: ["legacy"]
-  # Only build legacy in one mode, to minimize extra CI time. Debug is chosen
-  # somewhat arbitrarily as likely being slightly faster.
-  - name: build all_packages for Android - legacy version
-    script: .ci/scripts/build_all_packages_app_legacy.sh
-    # The final argument here must match the output directory passed to
-    # create_all_packages_app_legacy above.
-    args: ["apk", "debug", "legacy"]