Merge upstream/main and bump version

Author: hrishikesh-kadam

.ci.yaml

@@ -1 +1 @@
-83134ac7e44c9c9a9637955de23abecc304b492e
+5e8b5f4ea293b092e583c0fa9ad82fe189a72aa5

.ci/flutter_master.version

@@ -1 +1 @@
-ead455963c12b453cdb2358cad34969c76daf180
+6c4930c4ac86fb286f30e31d0ec8bffbcbb9953e

.ci/flutter_stable.version

@@ -11,7 +11,7 @@ tasks:
     args:
       - "firebase-test-lab"
       - "--device"
-      - "model=redfin,version=30"
+      - "model=panther,version=33"
       - "--exclude=script/configs/exclude_integration_android.yaml"
       - "--project=flutter-infra-staging"
       - "--results-bucket=flutter_firebase_testlab_staging"

.ci/targets/android_device_tests.yaml

@@ -0,0 +1,16 @@
+tasks:
+  - name: prepare tool
+    script: .ci/scripts/prepare_tool.sh
+    infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: download Dart and Android deps
+    script: script/tool_runner.sh
+    infra_step: true
+    args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--exclude=script/configs/exclude_integration_android_legacy_emulator.yaml"]
+  # Only these two tests are run because they are the only ones that use the
+  # emulator. Other tests would just duplicate android_platform_test.yaml tests.
+  - name: native integration tests
+    script: script/tool_runner.sh
+    args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/exclude_integration_android_legacy_emulator.yaml"]
+  - name: drive examples
+    script: script/tool_runner.sh
+    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android_legacy_emulator.yaml,script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml"]

.ci/targets/android_legacy_emulator_tests.yaml

@@ -5,23 +5,23 @@ tasks:
   - name: download Dart and Android deps
     script: script/tool_runner.sh
     infra_step: true
-    args: ["fetch-deps", "--android", "--supporting-target-platforms-only"]
+    args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   - name: build examples
     script: script/tool_runner.sh
-    args: ["build-examples", "--apk"]
+    args: ["build-examples", "--apk", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   - name: lint
     script: script/tool_runner.sh
-    args: ["lint-android"]
+    args: ["lint-android", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   # Native unit and native integration are split into two steps to allow for
   # different exclusions.
   # TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
   # these steps.
   - name: native unit tests
     script: script/tool_runner.sh
-    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"]
+    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml,script/configs/still_requires_api_33_avd.yaml"]
   - name: native integration tests
     script: script/tool_runner.sh
-    args: ["native-test", "--android", "--no-unit"]
+    args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   - name: drive examples
     script: script/tool_runner.sh
-    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml"]
+    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml,script/configs/still_requires_api_33_avd.yaml"]

.ci/targets/android_platform_tests.yaml

@@ -20,11 +20,11 @@ tasks:
   # these steps.
   - name: native unit tests
     script: script/tool_runner.sh
-    args: ["native-test", "--android", "--no-integration", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
   - name: native integration tests
     script: script/tool_runner.sh
     args: ["native-test", "--android", "--no-unit", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
   - name: drive examples
     script: script/tool_runner.sh
-    args: ["drive-examples", "--android", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
+    args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
 

.ci/targets/android_platform_tests_api_33_avd.yaml

@@ -209,6 +209,17 @@ updates:
       - dependency-name: "*"
         update-types: ["version-update:semver-minor", "version-update:semver-patch"]
 
+  - package-ecosystem: "gradle"
+    directory: "/packages/flutter_image/example/android/app"
+    commit-message:
+      prefix: "[flutter_image]"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-minor", "version-update:semver-patch"]
+
   - package-ecosystem: "gradle"
     directory: "/packages/flutter_markdown/example/android/app"
     commit-message:

.github/dependabot.yml

@@ -36,7 +36,7 @@ jobs:
         cd $GITHUB_WORKSPACE
     # Checks out a copy of the repo.
     - name: Check out code
-      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       with:
         fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
     - name: Set up tools

.github/workflows/release.yml

@@ -21,12 +21,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2.4.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v2.4.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.0.3
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.0.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -49,6 +49,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@fdcae64e1484d349b3366718cdfef3d404390e85 # v1.0.26
+        uses: github/codeql-action/upload-sarif@49abf0ba24d0b7953cb586944e918a0b92074c80 # v1.0.26
         with:
           sarif_file: results.sarif