Merge remote-tracking branch 'upstream/main' into dependabot/gradle/packages/path_provider/path_provider_android/android/junit-junit-4.13.2

Author: camsim99

.ci.yaml

@@ -13,15 +13,15 @@ platform_properties:
     properties:
       dependencies: >
         [
-          {"dependency": "curl"}
+          {"dependency": "curl", "version": "version:7.64.0"}
         ]
       device_type: none
       os: Linux
   windows:
     properties:
       dependencies: >
         [
-          {"dependency": "certs"}
+          {"dependency": "certs", "version": "version:9563bb"}
         ]
       device_type: none
       os: Windows
@@ -37,7 +37,7 @@ targets:
       version_file: flutter_master.version
       dependencies: >
         [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
   - name: Windows win32-platform_tests stable
@@ -49,7 +49,7 @@ targets:
       channel: stable
       dependencies: >
         [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
   - name: Windows windows-build_all_plugins master
@@ -62,7 +62,7 @@ targets:
       version_file: flutter_master.version
       dependencies: >
         [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
   - name: Windows windows-build_all_plugins stable
@@ -74,7 +74,7 @@ targets:
       channel: stable
       dependencies: >
         [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
   - name: Windows plugin_tools_tests

.ci/flutter_master.version

@@ -1 +1 @@
-52c47e96a33df14a5f43216fa88cf2165ea4d659
+25e0e290e6a4182e030ea9a352c6124ea36ca22d

.ci/scripts/prepare_tool.sh

@@ -4,7 +4,7 @@
 # found in the LICENSE file.
 
 # To set FETCH_HEAD for "git merge-base" to work
-git fetch origin master
+git fetch origin main
 
 cd script/tool
 dart pub get

.cirrus.yml

@@ -86,9 +86,6 @@ task:
         - dart pub run test
     - name: publishable
       env:
-        # TODO (mvanbeusekom): Temporary override to "stable" because of failure on "master".
-        # Remove override once https://github.com/dart-lang/pub/issues/3152 is resolved.
-        CHANNEL: stable
         CHANGE_DESC: "$TMPDIR/change-description.txt"
       version_check_script:
         # For pre-submit, pass the PR description to the script to allow for

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,15 +21,15 @@
 If you need help, consider asking for advice on the #hackers-new channel on [Discord].
 
 <!-- Links -->
-[Contributor Guide]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md
+[Contributor Guide]: https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md
 [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
-[relevant style guides]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md#style
+[relevant style guides]: https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md#style
 [CLA]: https://cla.developers.google.com/
 [flutter/tests]: https://github.com/flutter/tests
 [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
 [Discord]: https://github.com/flutter/flutter/wiki/Chat
 [pub versioning philosophy]: https://dart.dev/tools/pub/versioning
 [exempt from version changes]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#version-and-changelog-updates
 [following repository CHANGELOG style]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changelog-style
-[the auto-formatter]: https://github.com/flutter/plugins/blob/master/script/tool/README.md#format-code
+[the auto-formatter]: https://github.com/flutter/plugins/blob/main/script/tool/README.md#format-code
 [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests

.github/dependabot.yml

@@ -287,3 +287,11 @@ updates:
     schedule:
       interval: "daily"
     open-pull-requests-limit: 10
+    
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    commit-message:
+      prefix: "[gh_actions]"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10

.github/workflows/mirror.yml

@@ -21,7 +21,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@9794b1493b6f1fa7b006c5f8635a19c76c98be95
+      - uses: actions/labeler@9fd24f1f9d6ceb64ba34d181b329ee72f99978a0
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true

.github/workflows/pull_request_label.yml

@@ -27,7 +27,7 @@ jobs:
         cd $GITHUB_WORKSPACE
     # Checks out a copy of the repo.
     - name: Check out code
-      uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+      uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
       with:
         fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
     - name: Set up tools
@@ -36,7 +36,7 @@ jobs:
 
     # This workflow should be the last to run. So wait for all the other tests to succeed.
     - name: Wait on all tests
-      uses: lewagon/wait-on-check-action@5e937358caba2c7876a2ee06e4a48d0664fe4967
+      uses: lewagon/wait-on-check-action@752bfae19aef55dab12a00bc36d48acc46b77e9d
       with:
         ref: ${{ github.sha }}
         running-workflow-name: 'release'

.github/workflows/release.yml

@@ -20,12 +20,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@c1aec4ac820532bab364f02a81873c555a0ba3a1
+        uses: ossf/scorecard-action@3e15ea8318eee9b333819ec77a36aca8d39df13e
         with:
           results_file: results.sarif
           results_format: sarif
@@ -40,14 +40,14 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f5d822707ee6e8fb81b04a5c0040b736da22e587
+        uses: github/codeql-action/upload-sarif@27ea8f8fe5977c00f5b37e076ab846c5bd783b96
         with:
           sarif_file: results.sarif