Merge remote-tracking branch 'upstream/master'

Author: guidezpl

.ci.yaml

@@ -27,6 +27,11 @@
 *.props.tmpl      text eol=crlf
 *.vcxproj.tmpl    text eol=crlf
 
+# Make sure that these Linux files always have LF line endings in checkout
+bin/flutter       text eol=lf
+bin/flutter-dev   text eol=lf
+bin/dart          text eol=lf
+
 # Never perform LF normalization on these files
 *.ico    binary
 *.jar    binary

.gitattributes

@@ -9,7 +9,7 @@ inputs:
     default: 'android-36'
   ANDROID_BUILDTOOLS:
     description: 'android buildtools version'
-    default: '36.0.0'
+    default: '36.1.0'
 
 runs:
   using: 'composite'

.github/actions/composite-flutter-setup/action.yml

@@ -6,12 +6,15 @@ name: Generate a content aware hash for the Flutter Engine
 
 on: workflow_dispatch
 
+permissions:
+  contents: read
+
 jobs:
   generate-engine-content-hash:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Generate Hash
         run: |

.github/workflows/content-aware-hash.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'flutter/flutter' }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
       - name: ./bin/flutter test --coverage
         run: pushd packages/flutter;../../bin/flutter test --coverage -j 1;popd
       - name: upload coverage

.github/workflows/coverage.yml

@@ -9,7 +9,9 @@ on:
     branches: master
     types: [labeled]
 
-permissions: write-all
+permissions:
+  contents: read
+  pull-requests: write
 
 jobs:
   cherrypick_not_merged_remove_label:
@@ -44,7 +46,7 @@ jobs:
         run: |
           echo "COMMIT_SHA=$(echo ${{ github.event.pull_request.merge_commit_sha }})" >> $GITHUB_ENV
       - name: Checkout Flutter Repo
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
         with:
           repository: flutteractionsbot/flutter
           path: flutter

.github/workflows/easy-cp.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'flutter/flutter' }}
     steps:
-      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771
+      - uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7
         with:
           process-only: 'issues'
           github-token: ${{ github.token }}

.github/workflows/files-changed.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Setup Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: ${{ github.repository }}
           ref: master

.github/workflows/lock.yaml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       # Note: we must check out the tree for the composite action to be available
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - uses: ./.github/actions/composite-flutter-setup
 
       - name: Tool Test