Pull in main branch into v4_webview (#6661)

Author: bparrishMines

.ci/Dockerfile

@@ -1,47 +1,40 @@
 # The Flutter version is not important here, since the CI scripts update Flutter
 # before running. What matters is that the base image is pinned to minimize
 # unintended changes when modifying this file.
-FROM cirrusci/flutter@sha256:505fe8bce2896c75b4df9ccf500b1604155bf932af7465ffcc66fcae8612f82f
+# This is the hash for the 3.0.0 image.
+FROM cirrusci/flutter@sha256:0224587bba33241cf908184283ec2b544f1b672d87043ead1c00521c368cf844
 
 RUN apt-get update -y
 
+# Set up Firebase Test Lab requirements.
 RUN apt-get install -y --no-install-recommends gnupg
-
-# Add repo for gcloud sdk and install it
 RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
     sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
-
 RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
     sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
-
 RUN apt-get update && apt-get install -y google-cloud-sdk && \
     gcloud config set core/disable_usage_reporting true && \
     gcloud config set component_manager/disable_update_check true
 
-RUN yes | sdkmanager \
-    "platforms;android-27" \
-    "build-tools;27.0.3" \
-    "extras;google;m2repository" \
-    "extras;android;m2repository"
-
-RUN yes | sdkmanager --licenses
-
-# Install formatter.
+# Install formatter for C-based languages.
 RUN apt-get install -y clang-format
 
-# Install xvfb to allow running headless
-RUN apt-get install -y xvfb libegl1-mesa
-# Install Linux desktop build tool requirements.
+# Install Linux desktop requirements:
+# - build tools.
 RUN apt-get install -y clang cmake ninja-build file pkg-config
-# Install necessary libraries.
+# - libraries.
 RUN apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev libgcrypt20-dev
+# - xvfb to allow running headless.
+RUN apt-get install -y xvfb libegl1-mesa
 
-# Add repo for Google Chrome and install it
+# Install Chrome and make it the default browser, for url_launcher tests.
+# IMPORTANT: Web tests should use a pinned version of Chromium, not this, since
+# this isn't pinned, so any time the docker image is re-created the version of
+# Chrome may change.
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
 RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list
 RUN apt-get update && apt-get install -y --no-install-recommends google-chrome-stable
-
-# Make Chrome the default so http: and file: has a handler for url_launcher tests.
+# Make Chrome the default for http:, https: and file:.
 RUN apt-get install -y xdg-utils
 RUN xdg-settings set default-web-browser google-chrome.desktop
 RUN xdg-mime default google-chrome.desktop inode/directory

.ci/flutter_master.version

@@ -1 +1 @@
-99475b1b0bee6ab09d0282b255c6b8c7e01ca4fe
+0e98194681fdd83ee1c0a90b8b5b176df121bf1e

.ci/flutter_stable.version

@@ -1 +1 @@
-e3c29ec00c9c825c891d75054c63fcc46454dca1
+6928314d505d2bb4777be05e45d7808a5aa91d2a

.ci/scripts/build_all_plugins.sh

@@ -3,6 +3,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-cd all_plugins
+cd all_packages
 flutter build windows --debug
 flutter build windows --release

.ci/scripts/create_all_plugins_app.sh

@@ -3,5 +3,5 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-dart ./script/tool/bin/flutter_plugin_tools.dart all-plugins-app \
+dart ./script/tool/bin/flutter_plugin_tools.dart create-all-packages-app \
     --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml

.ci/scripts/prepare_tool.sh

@@ -4,13 +4,26 @@ gcp_credentials: ENCRYPTED[!f1177d1ddb5330ffaa9ea11c9c9e8e0c542185e895c36071f18c
 only_if: $CIRRUS_TAG == '' && ($CIRRUS_PR != '' || $CIRRUS_BRANCH == 'main')
 env:
   CHANNEL: "master" # Default to master when not explicitly set by a task.
-  PLUGIN_TOOL: "./script/tool/bin/flutter_plugin_tools.dart"
+  PLUGIN_TOOL_COMMAND: "dart ./script/tool/bin/flutter_plugin_tools.dart"
 
 tool_setup_template: &TOOL_SETUP_TEMPLATE
   tool_setup_script:
-    - git fetch origin main # To set FETCH_HEAD for "git merge-base" to work
-    - cd script/tool
-    - dart pub get
+    - .ci/scripts/prepare_tool.sh
+
+macos_template: &MACOS_TEMPLATE
+  # Only one macOS task can run in parallel without credits, so use them for
+  # PRs on macOS.
+  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
+
+macos_intel_template: &MACOS_INTEL_TEMPLATE
+  << : *MACOS_TEMPLATE
+  osx_instance:
+    image: big-sur-xcode-13
+
+macos_arm_template: &MACOS_ARM_TEMPLATE
+  << : *MACOS_TEMPLATE
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-ventura-xcode:14
 
 flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
   upgrade_flutter_script:
@@ -39,33 +52,18 @@ flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
 
 build_all_plugins_app_template: &BUILD_ALL_PLUGINS_APP_TEMPLATE
   create_all_plugins_app_script:
-    - dart $PLUGIN_TOOL all-plugins-app --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml
+    - $PLUGIN_TOOL_COMMAND create-all-packages-app --output-dir=. --exclude script/configs/exclude_all_plugins_app.yaml
   build_all_plugins_debug_script:
-    - cd all_plugins
+    - 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:
-    - cd all_plugins
+    - cd all_packages
     - flutter build $BUILD_ALL_ARGS --release
 
-macos_template: &MACOS_TEMPLATE
-  # Only one macOS task can run in parallel without credits, so use them for
-  # PRs on macOS.
-  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
-
-macos_intel_template: &MACOS_INTEL_TEMPLATE
-  << : *MACOS_TEMPLATE
-  osx_instance:
-    image: big-sur-xcode-13
-
-macos_arm_template: &MACOS_ARM_TEMPLATE
-  << : *MACOS_TEMPLATE
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-ventura-xcode:14
-
 # Light-workload Linux tasks.
 # These use default machines, with fewer CPUs, to reduce pressure on the
 # concurrency limits.
@@ -84,22 +82,13 @@ task:
       script:
         - cd script/tool
         - dart pub run test
-    - name: publishable
-      version_check_script:
-        # For pre-submit, pass the PR labels to the script to allow for version
-        # check overrides.
-        # For post-submit, ignore platform version breaking version changes and
-        # missing version/CHANGELOG detection since the labels aren't
-        # available outside of the context of the PR.
-        - if [[ $CIRRUS_PR == "" ]]; then
-        -   ./script/tool_runner.sh version-check --ignore-platform-interface-breaks
-        - else
-        -   ./script/tool_runner.sh version-check --check-for-missing-changes --pr-labels="$CIRRUS_PR_LABELS"
-        - fi
-      publish_check_script: ./script/tool_runner.sh publish-check
-    - name: format
+    # Repository rules and best-practice enforcement.
+    # Only channel-agnostic tests should go here since it is only run once
+    # (on Flutter master).
+    - name: repo_checks
       always:
         format_script: ./script/tool_runner.sh format --fail-on-change
+        license_script: $PLUGIN_TOOL_COMMAND license-check
         pubspec_script: ./script/tool_runner.sh pubspec-check
         readme_script:
           - ./script/tool_runner.sh readme-check
@@ -108,19 +97,33 @@ task:
           # has been fixed, this can be removed and there can just be a single
           # run with --require-excerpts and no exclusions.
           - ./script/tool_runner.sh readme-check --require-excerpts --exclude=script/configs/temp_exclude_excerpt.yaml
-        license_script: dart $PLUGIN_TOOL license-check
-        dependabot_script: dart $PLUGIN_TOOL dependabot-check
-    - name: federated_safety
-      # This check is only meaningful for PRs, as it validates changes
-      # rather than state.
-      only_if: $CIRRUS_PR != ""
-      script: ./script/tool_runner.sh federation-safety-check
+        dependabot_script: $PLUGIN_TOOL_COMMAND dependabot-check
+        version_script:
+          # For pre-submit, pass the PR labels to the script to allow for
+          # check overrides.
+          # For post-submit, ignore platform version breaking version changes
+          # and missing version/CHANGELOG detection since the labels aren't
+          # available outside of the context of the PR.
+          - if [[ $CIRRUS_PR == "" ]]; then
+          -   ./script/tool_runner.sh version-check --ignore-platform-interface-breaks
+          - else
+          -   ./script/tool_runner.sh version-check --check-for-missing-changes --pr-labels="$CIRRUS_PR_LABELS"
+          - fi
+        publishable_script: ./script/tool_runner.sh publish-check --allow-pre-release
+        federated_safety_script:
+          # This check is only meaningful for PRs, as it validates changes
+          # rather than state.
+          - if [[ $CIRRUS_PR == "" ]]; then
+          -   ./script/tool_runner.sh federation-safety-check
+          - else
+          -   echo "Only run in presubmit"
+          - fi
     - name: dart_unit_tests
       env:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
-      test_script:
+      unit_test_script:
         - ./script/tool_runner.sh test
     - name: analyze
       env:
@@ -142,39 +145,42 @@ task:
         # This uses --run-on-dirty-packages rather than --packages-for-branch
         # since only the packages changed by 'make-deps-path-based' need to be
         # checked.
-        - dart $PLUGIN_TOOL analyze --run-on-dirty-packages --log-timing --custom-analysis=script/configs/custom_analysis.yaml
+        - $PLUGIN_TOOL_COMMAND analyze --run-on-dirty-packages --log-timing --custom-analysis=script/configs/custom_analysis.yaml
         # Restore the tree to a clean state, to avoid accidental issues if
         # other script steps are added to this task.
         - git checkout .
-    # Does a sanity check that plugins at least pass analysis on the N-1 and N-2
-    # versions of Flutter stable if the plugin claims to support that version.
+    # Does a sanity check that packages at least pass analysis on the N-1 and N-2
+    # versions of Flutter stable if the package claims to support that version.
     # This is to minimize accidentally making changes that break old versions
     # (which we don't commit to supporting, but don't want to actively break)
     # without updating the constraints.
     # Note: The versions below should be manually updated after a new stable
     # version comes out.
-    - name: legacy-version-analyze
+    - name: legacy_version_analyze
       depends_on: analyze
-      env:
-        matrix:
+      matrix:
+        env:
           CHANNEL: "3.0.5"
+          DART_VERSION: "2.17.6"
+        env:
           CHANNEL: "2.10.5"
+          DART_VERSION: "2.16.2"
       package_prep_script:
-        # Allow analyzing plugins that use a Pigeon version with a higher
-        # minimum Flutter/Dart version than the plugin itself.
+        # Allow analyzing packages that use a dev dependency with a higher
+        # minimum Flutter/Dart version than the package itself.
         - ./script/tool_runner.sh remove-dev-dependencies
       analyze_script:
         # Only analyze lib/; non-client code doesn't need to work on
         # all supported legacy version.
-        - ./script/tool_runner.sh analyze --lib-only --skip-if-not-supporting-flutter-version="$CHANNEL" --custom-analysis=script/configs/custom_analysis.yaml
-    # Does a sanity check that plugins pass analysis with the lowest possible
+        - ./script/tool_runner.sh analyze --lib-only --skip-if-not-supporting-flutter-version="$CHANNEL" --skip-if-not-supporting-dart-version="$DART_VERSION" --custom-analysis=script/configs/custom_analysis.yaml
+    # Does a sanity check that packages pass analysis with the lowest possible
     # versions of all dependencies. This is to catch cases where we add use of
-    # new APIs but forget to update minimum versions of dependencies to when
+    # new APIs but forget to update minimum versions of dependencies to where
     # those APIs are introduced.
     - name: downgraded_analyze
       depends_on: analyze
       analyze_script:
-        - ./script/tool_runner.sh analyze --downgrade
+        - ./script/tool_runner.sh analyze --downgrade --custom-analysis=script/configs/custom_analysis.yaml
     - name: readme_excerpts
       env:
         CIRRUS_CLONE_SUBMODULES: true
@@ -194,8 +200,6 @@ task:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
-      setup_script:
-        - flutter config --enable-linux-desktop
       << : *BUILD_ALL_PLUGINS_APP_TEMPLATE
     - name: linux-platform_tests
       # Don't run full platform tests on both channels in pre-submit.
@@ -205,7 +209,6 @@ task:
           CHANNEL: "master"
           CHANNEL: "stable"
       build_script:
-        - flutter config --enable-linux-desktop
         - ./script/tool_runner.sh build-examples --linux
       native_test_script:
         - xvfb-run ./script/tool_runner.sh native-test --linux --no-integration
@@ -244,38 +247,20 @@ task:
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[30e6cf7189e3ff3868edc25d2e638ef2aec70546456427064bbc74b297d36145364f49f9d26b327787a59df149d69262]
       build_script:
-        # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
-        # might include non-ASCII characters which makes Gradle crash.
-        # TODO(stuartmorgan): See https://github.com/flutter/flutter/issues/24935
-        - export CIRRUS_CHANGE_MESSAGE=""
-        - export CIRRUS_COMMIT_MESSAGE=""
         - ./script/tool_runner.sh build-examples --apk
       lint_script:
-        # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
-        # might include non-ASCII characters which makes Gradle crash.
-        # TODO(stuartmorgan): See https://github.com/flutter/flutter/issues/24935
-        - export CIRRUS_CHANGE_MESSAGE=""
-        - export CIRRUS_COMMIT_MESSAGE=""
         - ./script/tool_runner.sh lint-android # must come after build-examples
       native_unit_test_script:
-        # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
-        # might include non-ASCII characters which makes Gradle crash.
-        # TODO(stuartmorgan): See https://github.com/flutter/flutter/issues/24935
-        - export CIRRUS_CHANGE_MESSAGE=""
-        - export CIRRUS_COMMIT_MESSAGE=""
         # 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
       firebase_test_lab_script:
-        # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
-        # might include non-ASCII characters which makes Gradle crash.
-        # TODO(stuartmorgan): See https://github.com/flutter/flutter/issues/24935
-        - export CIRRUS_CHANGE_MESSAGE=""
-        - export CIRRUS_COMMIT_MESSAGE=""
         - if [[ -n "$GCLOUD_FIREBASE_TESTLAB_KEY" ]]; then
         -   echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json
-        -   ./script/tool_runner.sh firebase-test-lab --device model=redfin,version=30 --device model=starqlteue,version=26 --exclude=script/configs/exclude_integration_android.yaml
+        # (TODO)cyanglaz: add --device model=starqlteue,version=26 back when the device issue is fixed in FTL.
+        # https://github.com/flutter/flutter/issues/114535
+        -   ./script/tool_runner.sh firebase-test-lab --device model=redfin,version=30 --exclude=script/configs/exclude_integration_android.yaml
         - else
         -   echo "This user does not have permission to run Firebase Test Lab tests."
         - fi
@@ -339,7 +324,6 @@ task:
           CHANNEL: "stable"
         PATH: $PATH:/usr/local/bin
       build_script:
-        - flutter config --enable-macos-desktop
         - ./script/tool_runner.sh build-examples --macos
       xcode_analyze_script:
         - ./script/tool_runner.sh xcode-analyze --macos
@@ -408,5 +392,4 @@ task:
           CHANNEL: "master"
           CHANNEL: "stable"
       setup_script:
-        - flutter config --enable-macos-desktop
       << : *BUILD_ALL_PLUGINS_APP_TEMPLATE

.cirrus.yml

@@ -21,7 +21,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@e54e5b338fbd6e6cdb5d60f51c22335fc57c401e
+      - uses: actions/labeler@5c7539237e04b714afd8ad9b4aed733815b9fab4
         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@2541b1294d2704b0964813337f33b291d3f8596b
+      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
       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@e2558238c09778af25867eb5de5a3ce4bbae3dcd
+      uses: lewagon/wait-on-check-action@3a563271c3f8d1611ed7352809303617ee7e54ac
       with:
         ref: ${{ github.sha }}
         running-workflow-name: 'release'
@@ -50,5 +50,5 @@ jobs:
       run: |
         git config --global user.name ${{ secrets.USER_NAME }}
         git config --global user.email ${{ secrets.USER_EMAIL }}
-        dart ./script/tool/lib/src/main.dart publish-plugin --all-changed --base-sha=HEAD~ --skip-confirmation --remote=origin
+        dart ./script/tool/lib/src/main.dart publish --all-changed --base-sha=HEAD~ --skip-confirmation --remote=origin
       env: {PUB_CREDENTIALS: "${{ secrets.PUB_CREDENTIALS }}"}