Merge branch 'main' into fix_168364

Author: wyqlxf

.ci.yaml

@@ -90,7 +90,7 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-14
+      os: Mac-14|Mac-15.5
       device_type: none
       cpu: arm64
       $flutter/osx_sdk : >-
@@ -103,7 +103,7 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-14
+      os: Mac-14|Mac-15.5
       device_type: none
       cpu: x86
       $flutter/osx_sdk : >-
@@ -395,69 +395,27 @@ targets:
     properties:
       version_file: flutter_master.version
       # This builds the all_packages app only in a current JDK.
-      target_file: android_build_all_packages_jdk17.yaml
+      target_file: android_build_all_packages.yaml
       channel: master
       env_variables: >-
         {
           "CHANNEL": "master"
         }
 
-  - name: Linux_android android_build_all_packages_legacy master
-    recipe: packages/packages
-    timeout: 30
-    properties:
-      version_file: flutter_master.version
-      # TODO(stuartmorgan): Once stable requires JDK 17, and the
-      # legacy project is updated accordingly, this entire target
-      # can be merged back into android_build_all_packages.
-      # This file only builds a *legacy* version of the project.
-      target_file: android_build_all_packages_legacy.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 stable
     recipe: packages/packages
     timeout: 30
     properties:
       add_recipes_cq: "true"
       version_file: flutter_stable.version
       # This builds the all_packages app only in a current JDK.
-      target_file: android_build_all_packages_jdk17.yaml
+      target_file: android_build_all_packages.yaml
       channel: stable
       env_variables: >-
         {
           "CHANNEL": "stable"
         }
 
-  - name: Linux_android android_build_all_packages_legacy stable
-    # Temporarily disabled to unblock roll to 3.32.
-    # See https://github.com/flutter/flutter/issues/169290
-    bringup: true
-    recipe: packages/packages
-    timeout: 30
-    properties:
-      version_file: flutter_stable.version
-      # This file only builds a *legacy* version of the project.
-      target_file: android_build_all_packages_legacy.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_platform_tests_shard_1 master
     recipe: packages/packages
     timeout: 60

.ci/flutter_master.version

@@ -1 +1 @@
-85564cbba9e7326072a7bbd1a7aa9b11bca1f2f0
+d8baa77b38461e7061e06e72c6bf50d64d302b8c

.ci/flutter_stable.version

@@ -1 +1 @@
-be698c48a6750c8cb8e61c740ca9991bb947aba2
+b25305a8832cfc6ba632a7f87ad455e319dccce8

.ci/legacy_project/README.md

@@ -37,16 +37,17 @@ and then deleting everything but `android/` from it:
 - Added license boilerplate.
 - Replaced `jcenter` in build.gradle with `mavenCentral`, due to the
   jcenter.bintray.com shutdown.
-- Update `compileSdkVersion` from 30 to 33 to maintain compatibility
-  with plugins that use API 34.
-- Updates `gradle-wrapper.properties` from `6.7` to `6.7.1`, to add
-  support for the Kotlin gradle plugin. If a user runs into this
-  error, the error message is clear on how to upgrade.
-- Modifies `build.gradle` to upgrade the Android Gradle Plugin (AGP)
-  from version 4.1.0 to 7.0.0. If a user runs into an error with
-  the AGP version, the warning is clear on how to upgrade
-  the version to one that we support.
+- Update `compileSdkVersion` from 30 to `flutter.compileSdkVersion` in
+  `build.gradle` to maintain compatibility with plugins that use
+  Flutter's most recently supported API version.
 - Modifies `gradle-wrapper.properties` to upgrade the Gradle version
-  from 6.7.1 to 7.0.2. If a user runs into an error with the Gradle
+  from 6.7 to 8.4. If a user runs into an error with the Gradle
   version, the warning is clear on how to upgrade the version to
-  one that we support.
+  one that we support.
+- Modifies `settings.gradle` to upgrade the Android Gradle Plugin (AGP)
+  from version 4.1.0 (originally set in `build.gradle`; see bullet below)
+  to 8.3.0. If a user runs into an error with the AGP version, the warning
+  is clear on how to upgrade the version to one that we support.
+- Refactor plugin to use declarative Gradle apply instead of the
+  imperative apply (this includes moving where the Android Gradle
+  Plugin (AGP) version is set from `build.gradle` to `settings.gradle`).

.ci/legacy_project/all_packages/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

.ci/legacy_project/all_packages/android/settings.gradle

@@ -19,7 +19,7 @@ pluginManagement {
 // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info.
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.0.0" apply false
+    id "com.android.application" version "8.3.0" apply false
     id "org.jetbrains.kotlin.android" version "1.9.0" apply false
 }
 

.ci/targets/android_build_all_packages_legacy.yaml renamed to .ci/targets/android_build_all_packages.yaml

@@ -1,8 +1,17 @@
-# This only builds the legacy all_packages app, which requires jdk11
+# This builds the modern all_packages app and the legacy all_packages app.
 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

.ci/targets/android_build_all_packages_jdk17.yaml

@@ -1,3 +1,7 @@
+## NEXT
+
+* Fixes overflowed toggles in the camera example.
+
 ## 0.11.1
 
 * Adds API support query for image streaming.

packages/camera/camera/CHANGELOG.md

@@ -225,43 +225,33 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
 
   /// Display the thumbnail of the captured image or video.
   Widget _thumbnailWidget() {
-    final VideoPlayerController? localVideoController = videoController;
-
-    return Expanded(
-      child: Align(
-        alignment: Alignment.centerRight,
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: <Widget>[
-            if (localVideoController == null && imageFile == null)
-              Container()
-            else
-              SizedBox(
-                width: 64.0,
-                height: 64.0,
-                child: (localVideoController == null)
-                    ? (
-                        // The captured image on the web contains a network-accessible URL
-                        // pointing to a location within the browser. It may be displayed
-                        // either with Image.network or Image.memory after loading the image
-                        // bytes to memory.
-                        kIsWeb
-                            ? Image.network(imageFile!.path)
-                            : Image.file(File(imageFile!.path)))
-                    : Container(
-                        decoration: BoxDecoration(
-                            border: Border.all(color: Colors.pink)),
-                        child: Center(
-                          child: AspectRatio(
-                              aspectRatio:
-                                  localVideoController.value.aspectRatio,
-                              child: VideoPlayer(localVideoController)),
-                        ),
-                      ),
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: <Widget>[
+        if (videoController case final VideoPlayerController controller?)
+          Container(
+            width: 64.0,
+            height: 64.0,
+            decoration: BoxDecoration(border: Border.all(color: Colors.pink)),
+            child: Center(
+              child: AspectRatio(
+                aspectRatio: controller.value.aspectRatio,
+                child: VideoPlayer(controller),
               ),
-          ],
-        ),
-      ),
+            ),
+          )
+        else if (imageFile?.path case final String path)
+          Container(
+            width: 64.0,
+            height: 64.0,
+            decoration: BoxDecoration(border: Border.all(color: Colors.pink)),
+            // The captured image on the web contains a network-accessible URL
+            // pointing to a location within the browser. It may be displayed
+            // either with Image.network or Image.memory after loading the image
+            // bytes to memory.
+            child: kIsWeb ? Image.network(path) : Image.file(File(path)),
+          ),
+      ],
     );
   }
 
@@ -598,7 +588,12 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
       }
     }
 
-    return Row(children: toggles);
+    return Expanded(
+      child: SizedBox(
+        height: 56.0,
+        child: ListView(scrollDirection: Axis.horizontal, children: toggles),
+      ),
+    );
   }
 
   String timestamp() => DateTime.now().millisecondsSinceEpoch.toString();
@@ -1048,6 +1043,9 @@ class CameraApp extends StatelessWidget {
   }
 }
 
+/// Getting available cameras for testing.
+@visibleForTesting
+List<CameraDescription> get cameras => _cameras;
 List<CameraDescription> _cameras = <CameraDescription>[];
 
 Future<void> main() async {