Merge branch 'main' into path-provider-foundation-ffi-rerelease

Author: stuartmorgan-g

.ci/flutter_master.version

@@ -1 +1 @@
-13b2b912c9095fe33924f0f073a6f5c9973ab139
+793b0b89e82ed5b198aaac2cdc889997b18d9313

.ci/flutter_stable.version

@@ -1 +1 @@
-66dd93f9a27ffe2a9bfc8297506ce066ff51265f
+8b872868494e429d94fa06dca855c306438b22c0

.gemini/config.yaml

@@ -11,6 +11,7 @@ code_review:
     # These tend to be verbose, and since we expect PR authors to clearly
     # describe their PRs this would be at best duplicative.
     summary: false
+    include_drafts: false
 ignore_patterns:
   - .ci/flutter_master.version
   - .ci/flutter_stable.version

.github/workflows/batch_release_pr.yml

@@ -2,7 +2,7 @@ name: "Creates Batch Release for a Package"
 
 on:
   repository_dispatch:
-    types: [batch_release_pr]
+    types: [batch-release-pr]
 
 jobs:
   create_release_pr:
@@ -12,6 +12,8 @@ jobs:
     steps:
       - name: checkout repository
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - name: "Install Flutter"
+        uses: ./.github/workflows/internals/install_flutter
       - name: Set up tools
         run: dart pub get
         working-directory: ${{ github.workspace }}/script/tool
@@ -34,7 +36,7 @@ jobs:
 
       - name: Create batch release PR
         if: steps.check-branch-exists.outputs.exists == 'true'
-        uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "[${{ github.event.client_payload.package }}] Batch release"

.github/workflows/go_router_batch.yml

@@ -10,10 +10,11 @@ on:
 jobs:
   dispatch_release_pr:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Repository Dispatch
         uses: peter-evans/repository-dispatch@5fc4efd1a4797ddb68ffd0714a238564e4cc0e6f
         with:
-          token: "${{ secrets.GITHUB_TOKEN }}"
-          event-type: batch_release_pr
+          event-type: batch-release-pr
           client-payload: '{"package": "go_router"}'

.github/workflows/internals/install_flutter/action.yml

@@ -0,0 +1,20 @@
+name: "Install Flutter"
+description: "Installs a pinned version of Flutter"
+runs:
+  using: "composite"
+  steps:
+    - name: "Install Flutter"
+      # This uses a pinned version of Flutter rather than `stable` so that it is
+      # not subject to out-of-band failures when new releases happen. It does
+      # not use the auto-rolled pin because there's no way for the autoroller
+      # to test the actual release flow, so changes would still show up in
+      # post-submit. A manually-rolled pin means that any changes here must be
+      # made deliberately, so that the person updating it knows to watch the
+      # next actual auto-release to ensure that it works, and knows to revert
+      # the change if it doesn't.
+      shell: bash
+      run: |
+        cd $HOME
+        git clone https://github.com/flutter/flutter.git --depth 1 -b 3.38.5 _flutter
+        echo "$HOME/_flutter/bin" >> $GITHUB_PATH
+        cd $GITHUB_WORKSPACE

.github/workflows/release.yml

@@ -16,29 +16,13 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-    - name: "Install Flutter"
-      # Github Actions don't support templates so it is hard to share this snippet with another action
-      # If we eventually need to use this in more workflow, we could create a shell script that contains this
-      # snippet.
-      #
-      # This uses a pinned version of Flutter rather than `stable` so that it is
-      # not subject to out-of-band failures when new releases happen. It does
-      # not use the auto-rolled pin because there's no way for the autoroller
-      # to test the actual release flow, so changes would still show up in
-      # post-submit. A manually-rolled pin means that any changes here must be
-      # made deliberately, so that the person updating it knows to watch the
-      # next actual auto-release to ensure that it works, and knows to revert
-      # the change if it doesn't.
-      run: |
-        cd $HOME
-        git clone https://github.com/flutter/flutter.git --depth 1 -b 3.38.5 _flutter
-        echo "$HOME/_flutter/bin" >> $GITHUB_PATH
-        cd $GITHUB_WORKSPACE
     # Checks out a copy of the repo.
     - name: Check out code
       uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
       with:
         fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
+    - name: "Install Flutter"
+      uses: ./.github/workflows/internals/install_flutter
     - name: Set up tools
       run: dart pub get
       working-directory: ${{ github.workspace }}/script/tool

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.6.27
+
+* Changes `availableCameras` to get the camera name from `Camera2CameraInfo.getCameraId`.
+
+## 0.6.26+3
+
+* Bumps kotlin_version to 2.3.0.
+
 ## 0.6.26+2
 
 * Updates pigeon generation to prevent crash when objects call to Dart after a hot restart.

packages/camera/camera_android_camerax/android/build.gradle

@@ -2,7 +2,7 @@ group = 'io.flutter.plugins.camerax'
 version = '1.0'
 
 buildscript {
-    ext.kotlin_version = '2.2.21'
+    ext.kotlin_version = '2.3.0'
     repositories {
         google()
         mavenCentral()

packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart

@@ -303,7 +303,6 @@ class AndroidCameraCameraX extends CameraPlatform {
         (await processCameraProvider!.getAvailableCameraInfos()).cast();
 
     CameraLensDirection? cameraLensDirection;
-    var cameraCount = 0;
     int? cameraSensorOrientation;
     String? cameraName;
 
@@ -324,13 +323,12 @@ class AndroidCameraCameraX extends CameraPlatform {
       }
 
       cameraSensorOrientation = cameraInfo.sensorRotationDegrees;
-      cameraName = 'Camera $cameraCount';
-      cameraCount++;
+      cameraName = await Camera2CameraInfo.from(
+        cameraInfo: cameraInfo,
+      ).getCameraId();
 
       _savedCameras[cameraName] = cameraInfo;
 
-      // TODO(camsim99): Use camera ID retrieved from Camera2CameraInfo as
-      // camera name: https://github.com/flutter/flutter/issues/147545.
       cameraDescriptions.add(
         CameraDescription(
           name: cameraName,