Merge branch 'main' into feat/add-image-builder

Author: suojae

.ci/flutter_master.version

@@ -1 +1 @@
-732e05dd483cf7f8ec68955e13fc9a5504d5f26a
+d117642c18e0d5e3a96ae00d4340b1b0724de24c

.ci/flutter_stable.version

@@ -1 +1 @@
-ff37bef603469fb030f2b72995ab929ccfc227f0
+2c9eb20739dfec95e2c74bd3dfa4601b0a8a36aa

.ci/scripts/enable_swift_package_manager.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+set -e
+
+flutter config --enable-swift-package-manager

.ci/targets/ios_platform_tests.yaml

@@ -2,12 +2,16 @@ tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: enable Swift Package Manager
+    # For consistency between stable and master channels, enable SwiftPM.
+    # TODO(stuartmorgan): Remove this step once it's the default on stable.
+    script: .ci/scripts/enable_swift_package_manager.sh
   - name: create simulator
     script: .ci/scripts/create_simulator.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: download Dart and iOS deps
     script: .ci/scripts/tool_runner.sh
-    args: ["fetch-deps", "--ios", "--supporting-target-platforms-only"]
+    args: ["fetch-deps", "--ios", "--supporting-target-platforms-only", "--swift-package-manager"]
     infra_step: true
   - name: build examples
     script: .ci/scripts/tool_runner.sh

.ci/targets/macos_platform_tests.yaml

@@ -2,9 +2,13 @@ tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: enable Swift Package Manager
+    # For consistency between stable and master channels, enable SwiftPM.
+    # TODO(stuartmorgan): Remove this step once it's the default on stable.
+    script: .ci/scripts/enable_swift_package_manager.sh
   - name: download Dart and macOS deps
     script: .ci/scripts/tool_runner.sh
-    args: ["fetch-deps", "--macos", "--supporting-target-platforms-only"]
+    args: ["fetch-deps", "--macos", "--supporting-target-platforms-only", "--swift-package-manager"]
     infra_step: true
   - name: build examples
     script: .ci/scripts/tool_runner.sh

packages/camera/camera_android/android/build.gradle

@@ -70,7 +70,7 @@ android {
 dependencies {
     implementation("androidx.annotation:annotation:1.9.1")
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.mockito:mockito-core:5.22.0")
+    testImplementation("org.mockito:mockito-core:5.23.0")
     testImplementation("androidx.test:core:1.7.0")
     testImplementation("org.robolectric:robolectric:4.16")
 }

packages/camera/camera_android_camerax/android/build.gradle

@@ -79,7 +79,7 @@ dependencies {
     implementation("androidx.camera:camera-video:${camerax_version}")
     implementation("com.google.guava:guava:33.5.0-android")
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.mockito:mockito-core:5.22.0")
+    testImplementation("org.mockito:mockito-core:5.23.0")
     testImplementation("org.mockito:mockito-inline:5.2.0")
     testImplementation("androidx.test:core:1.7.0")
     testImplementation("org.robolectric:robolectric:4.16")

packages/camera/camera_avfoundation/pigeons/messages.dart

@@ -190,9 +190,6 @@ class PlatformSize {
 @HostApi()
 abstract class CameraApi {
   /// Returns the list of available cameras.
-  // TODO(stuartmorgan): Make the generic type non-nullable once supported.
-  // https://github.com/flutter/flutter/issues/97848
-  // The consuming code treats it as non-nullable.
   @async
   @ObjCSelector('availableCamerasWithCompletion')
   List<PlatformCameraDescription> getAvailableCameras();

packages/file_selector/file_selector_android/android/build.gradle

@@ -37,7 +37,7 @@ android {
     dependencies {
         implementation("androidx.annotation:annotation:1.9.1")
         testImplementation("junit:junit:4.13.2")
-        testImplementation("org.mockito:mockito-core:5.22.0")
+        testImplementation("org.mockito:mockito-core:5.23.0")
         testImplementation("androidx.test:core:1.7.0")
         testImplementation("org.robolectric:robolectric:4.16")
     }

packages/flutter_plugin_android_lifecycle/android/build.gradle

@@ -62,5 +62,5 @@ android {
 
 dependencies {
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.mockito:mockito-core:5.22.0")
+    testImplementation("org.mockito:mockito-core:5.23.0")
 }