Merge branch 'main' of github.com:flutter/plugins into webview_identifier_2

Author: bparrishMines

.ci.yaml

@@ -64,7 +64,7 @@ targets:
       target_file: macos_lint_podspecs.yaml
 
   ### macOS desktop tasks ###
-  # macos-platform_tests builds all the plugins on ARM, so this build is run
+  # macos_platform_tests builds all the plugins on ARM, so this build is run
   # on Intel to give us build coverage of both host types.
   - name: Mac_x64 build_all_plugins master
     recipe: plugins/plugins
@@ -104,29 +104,9 @@ targets:
       target_file: macos_platform_tests.yaml
 
   ### iOS tasks ###
-  # TODO(stuartmorgan): Swap the architecture of this and ios_platform_tests_*
-  # once simulator tests are reliable on the ARM infrastructure. See discussion
-  # at https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089
-  - name: Mac_arm64 ios_build_all_plugins master
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      channel: master
-      add_recipes_cq: "true"
-      version_file: flutter_master.version
-      target_file: ios_build_all_plugins.yaml
-
-  - name: Mac_arm64 ios_build_all_plugins stable
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      channel: stable
-      add_recipes_cq: "true"
-      version_file: flutter_stable.version
-      target_file: ios_build_all_plugins.yaml
-
+  # ios_platform_tests builds all the plugins on ARM, so this build is run
+  # on Intel to give us build coverage of both host types.
   - name: Mac_x64 ios_build_all_plugins master
-    bringup: true # New task, replaces ARM version
     recipe: plugins/plugins
     timeout: 30
     properties:
@@ -136,7 +116,6 @@ targets:
       target_file: ios_build_all_plugins.yaml
 
   - name: Mac_x64 ios_build_all_plugins stable
-    bringup: true # New task, replaces ARM version
     recipe: plugins/plugins
     timeout: 30
     properties:
@@ -145,145 +124,59 @@ targets:
       version_file: flutter_stable.version
       target_file: ios_build_all_plugins.yaml
 
-  # TODO(stuartmorgan): Swap the architecture of this and ios_build_all_plugins
-  # once simulator tests are reliable on the ARM infrastructure. See discussion
-  # at https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089
-  - name: Mac_x64 ios_platform_tests_1_of_4 master
-    recipe: plugins/plugins
-    timeout: 60
-    properties:
-      add_recipes_cq: "true"
-      version_file: flutter_master.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 0 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_2_of_4 master
-    recipe: plugins/plugins
-    timeout: 60
-    properties:
-      add_recipes_cq: "true"
-      version_file: flutter_master.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 1 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_3_of_4 master
-    recipe: plugins/plugins
-    timeout: 60
-    properties:
-      add_recipes_cq: "true"
-      version_file: flutter_master.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 2 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_4_of_4 master
-    recipe: plugins/plugins
-    timeout: 60
-    properties:
-      add_recipes_cq: "true"
-      version_file: flutter_master.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 3 --shardCount 4"
-
+  # TODO(stuartmorgan): Change all of the ios_platform_tests_* task timeouts
+  # to 60 minutes once https://github.com/flutter/flutter/issues/119750 is
+  # fixed.
   - name: Mac_arm64 ios_platform_tests_shard_1 master - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
-    timeout: 60
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 0 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_2 master - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
-    timeout: 60
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 1 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_3 master - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
-    timeout: 60
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 2 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_4 master - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
-    timeout: 60
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 3 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_5 master - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
-    timeout: 60
+    timeout: 120
     properties:
       add_recipes_cq: "true"
       version_file: flutter_master.version
       target_file: ios_platform_tests.yaml
       package_sharding: "--shardIndex 4 --shardCount 5"
 
   # Don't run full platform tests on both channels in pre-submit.
-  - name: Mac_x64 ios_platform_tests_1_of_4 stable
-    recipe: plugins/plugins
-    presubmit: false
-    timeout: 60
-    properties:
-      channel: stable
-      add_recipes_cq: "true"
-      version_file: flutter_stable.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 0 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_2_of_4 stable
-    recipe: plugins/plugins
-    presubmit: false
-    timeout: 60
-    properties:
-      channel: stable
-      add_recipes_cq: "true"
-      version_file: flutter_stable.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 1 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_3_of_4 stable
-    recipe: plugins/plugins
-    presubmit: false
-    timeout: 60
-    properties:
-      channel: stable
-      add_recipes_cq: "true"
-      version_file: flutter_stable.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 2 --shardCount 4"
-
-  - name: Mac_x64 ios_platform_tests_4_of_4 stable
-    recipe: plugins/plugins
-    presubmit: false
-    timeout: 60
-    properties:
-      channel: stable
-      add_recipes_cq: "true"
-      version_file: flutter_stable.version
-      target_file: ios_platform_tests.yaml
-      package_sharding: "--shardIndex 3 --shardCount 4"
-
   - name: Mac_arm64 ios_platform_tests_shard_1 stable - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
     presubmit: false
-    timeout: 60
+    timeout: 120
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -292,10 +185,9 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_2 stable - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
     presubmit: false
-    timeout: 60
+    timeout: 120
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -304,10 +196,9 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_3 stable - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
     presubmit: false
-    timeout: 60
+    timeout: 120
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -316,10 +207,9 @@ targets:
       package_sharding: "--shardIndex 2 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_4 stable - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
     presubmit: false
-    timeout: 60
+    timeout: 120
     properties:
       channel: stable
       add_recipes_cq: "true"
@@ -328,10 +218,9 @@ targets:
       package_sharding: "--shardIndex 3 --shardCount 5"
 
   - name: Mac_arm64 ios_platform_tests_shard_5 stable - plugins
-    bringup: true # New task; will replace Intel version
     recipe: plugins/plugins
     presubmit: false
-    timeout: 60
+    timeout: 120
     properties:
       channel: stable
       add_recipes_cq: "true"

.ci/flutter_master.version

@@ -1 +1 @@
-0a22a1dbf475e567d97ddae079392adcd6745b8d
+e3471f08d1d3f816fff8afd1ce9385dd3feb73d2

.ci/flutter_stable.version

@@ -1 +1 @@
-b06b8b2710955028a6b562f5aa6fe62941d6febf
+7048ed95a5ad3e43d697e0c397464193991fc230

.ci/scripts/create_all_plugins_app.sh

@@ -4,4 +4,4 @@
 # found in the LICENSE file.
 
 dart ./script/tool/bin/flutter_plugin_tools.dart create-all-packages-app \
-    --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml
+    --output-dir=. --exclude script/configs/exclude_all_packages_app.yaml

.cirrus.yml

@@ -1,4 +1,4 @@
-gcp_credentials: ENCRYPTED[!9e38557f08108136b3625b7e62c64cc9eccc50365ffeaaa55c6be52f1d8fd6225af5badc69983ca08484274f02f34424!]
+gcp_credentials: ENCRYPTED[!3a93d98d7c95a41f5033834ef30e50928fc5d81239dc632b153c2628200a8187f3811cb01ce338b1ab3b6505a7a65c37!]
 
 # Run on PRs and main branch post submit only. Don't run tests when tagging.
 only_if: $CIRRUS_TAG == '' && ($CIRRUS_PR != '' || $CIRRUS_BRANCH == 'main')
@@ -47,17 +47,19 @@ flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
     - flutter doctor -v
   << : *TOOL_SETUP_TEMPLATE
 
-build_all_plugins_app_template: &BUILD_ALL_PLUGINS_APP_TEMPLATE
-  create_all_plugins_app_script:
-    - $PLUGIN_TOOL_COMMAND create-all-packages-app --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml
-  build_all_plugins_debug_script:
+# Ensures that the latest versions of all of the 1P packages can be used
+# together. See script/configs/exclude_all_packages_app.yaml for exceptions.
+build_all_packages_app_template: &BUILD_ALL_PACKAGES_APP_TEMPLATE
+  create_all_packages_app_script:
+    - $PLUGIN_TOOL_COMMAND create-all-packages-app --output-dir=. --exclude script/configs/exclude_all_packages_app.yaml
+  build_all_packages_debug_script:
     - cd all_packages
     - if [[ "$BUILD_ALL_ARGS" == "web" ]]; then
     -   echo "Skipping; web does not support debug builds"
     - else
     -   flutter build $BUILD_ALL_ARGS --debug
     - fi
-  build_all_plugins_release_script:
+  build_all_packages_release_script:
     - cd all_packages
     - flutter build $BUILD_ALL_ARGS --release
 
@@ -117,13 +119,6 @@ task:
           - else
           -   echo "Only run in presubmit"
           - fi
-    - name: dart_unit_tests
-      env:
-        matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
-      unit_test_script:
-        - ./script/tool_runner.sh test
     - name: analyze
       env:
         matrix:
@@ -186,21 +181,21 @@ task:
         CIRRUS_CLONE_SUBMODULES: true
       script: ./script/tool_runner.sh update-excerpts --fail-on-change
     ### Web tasks ###
-    - name: web-build_all_plugins
+    - name: web-build_all_packages
       env:
         BUILD_ALL_ARGS: "web"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
-      << : *BUILD_ALL_PLUGINS_APP_TEMPLATE
+      << : *BUILD_ALL_PACKAGES_APP_TEMPLATE
     ### Linux desktop tasks ###
-    - name: linux-build_all_plugins
+    - name: linux-build_all_packages
       env:
         BUILD_ALL_ARGS: "linux"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
-      << : *BUILD_ALL_PLUGINS_APP_TEMPLATE
+      << : *BUILD_ALL_PACKAGES_APP_TEMPLATE
     - name: linux-platform_tests
       # Don't run full platform tests on both channels in pre-submit.
       skip: $CIRRUS_PR != '' && $CHANNEL == 'stable'
@@ -230,6 +225,14 @@ task:
     cpu: 4
     memory: 16G
   matrix:
+    ### Platform-agnostic tasks ###
+    - name: dart_unit_tests
+      env:
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
+      unit_test_script:
+        - ./script/tool_runner.sh test
     ### Android tasks ###
     - name: android-platform_tests
       # Don't run full platform tests on both channels in pre-submit.
@@ -251,7 +254,7 @@ task:
       lint_script:
         - ./script/tool_runner.sh lint-android # must come after build-examples
       native_unit_test_script:
-        # Native integration tests are handled by firebase-test-lab below, so
+        # Native integration tests are handled by Firebase Test Lab below, so
         # only run unit tests.
         # Must come after build-examples.
         - ./script/tool_runner.sh native-test --android --no-integration --exclude script/configs/exclude_native_unit_android.yaml
@@ -268,13 +271,13 @@ task:
           path: "**/reports/lint-results-debug.xml"
           type: text/xml
           format: android-lint
-    - name: android-build_all_plugins
+    - name: android-build_all_packages
       env:
         BUILD_ALL_ARGS: "apk"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
-      << : *BUILD_ALL_PLUGINS_APP_TEMPLATE
+      << : *BUILD_ALL_PACKAGES_APP_TEMPLATE
     ### Web tasks ###
     - name: web-platform_tests
       env:

.github/workflows/scorecards-analysis.yml

@@ -42,14 +42,14 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
         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@959cbb7472c4d4ad70cdfe6f4976053fe48ab394
+        uses: github/codeql-action/upload-sarif@3ebbd71c74ef574dbc558c82f70e52732c8b44fe
         with:
           sarif_file: results.sarif