Merge branch 'master' of https://github.com/flutter/plugins

* 'master' of https://github.com/flutter/plugins: (600 commits)
  [google_sign_in, in_app_purchase_android] Add availability to mock models (flutter#5642)
  Roll Flutter from de7c23e to ec20ea8 (1 revision) (flutter#5805)
  Roll Flutter from b8b0c80 to de7c23e (1 revision) (flutter#5804)
  Roll Flutter from 4654fd0 to b8b0c80 (1 revision) (flutter#5803)
  Roll Flutter from 6aaabf6 to 4654fd0 (2 revisions) (flutter#5802)
  Roll Flutter from 1e10cec to 6aaabf6 (1 revision) (flutter#5800)
  Roll Flutter from 1e1f4bc to 1e10cec (6 revisions) (flutter#5799)
  Roll Flutter from a4a8e73 to 1e1f4bc (65 revisions) (flutter#5795)
  [google_sign_in] Suppress `deprecation` warnings (flutter#5049)
  [video_player] Fix order-dependent tests (flutter#5672)
  [path_provider] Fix integration tests on macOS (flutter#5773)
  [google_maps_flutter_web] Remove custom analysis file. (flutter#5791)
  [various] Set minimum Flutter versions to 2.8 (flutter#5792)
  [ci] Updates iOS deprecation check to iOS 13 (flutter#5786)
  Roll Flutter from 1994027 to a4a8e73 (31 revisions) (flutter#5782)
  [google_sign_in] Upgrade to GoogleSignIn 6.2, support arm64 simulators (flutter#5708)
  [local_auth] Adds federated Windows support (flutter#5776)
  [tools] Add `update-release-info` (flutter#5643)
  Add more CODEOWNERS (flutter#5779)
  [ci/tools] Add iOS/macOS analysis to catch deprecated code (flutter#5778)
  ...

.ci.yaml

@@ -7,14 +7,10 @@
 #  * https://github.com/flutter/cocoon/blob/main/CI_YAML.md
 enabled_branches:
   - main
-  - master
 
 platform_properties:
   linux:
     properties:
-      caches: >-
-        [
-        ]
       dependencies: >
         [
           {"dependency": "curl"}
@@ -23,11 +19,6 @@ platform_properties:
       os: Linux
   windows:
     properties:
-      caches: >-
-        [
-          {"name": "vsbuild", "path": "vsbuild"},
-          {"name": "pub_cache", "path": ".pub-cache"}
-        ]
       dependencies: >
         [
           {"dependency": "certs"}
@@ -42,11 +33,12 @@ targets:
     properties:
       add_recipes_cq: "true"
       target_file: windows_build_and_platform_tests.yaml
+      channel: master
+      version_file: flutter_master.version
       dependencies: >
         [
           {"dependency": "vs_build"}
         ]
-    scheduler: luci
 
   - name: Windows win32-platform_tests stable
     recipe: plugins/plugins
@@ -59,19 +51,19 @@ targets:
         [
           {"dependency": "vs_build"}
         ]
-    scheduler: luci
 
   - name: Windows windows-build_all_plugins master
     recipe: plugins/plugins
     timeout: 30
     properties:
       add_recipes_cq: "true"
       target_file: build_all_plugins.yaml
+      channel: master
+      version_file: flutter_master.version
       dependencies: >
         [
           {"dependency": "vs_build"}
         ]
-    scheduler: luci
 
   - name: Windows windows-build_all_plugins stable
     recipe: plugins/plugins
@@ -84,31 +76,18 @@ targets:
         [
           {"dependency": "vs_build"}
         ]
-    scheduler: luci
-
-  - name: Windows uwp-platform_tests master
-    recipe: plugins/plugins
-    timeout: 30
-    properties:
-      add_recipes_cq: "true"
-      target_file: uwp_build_and_platform_tests.yaml
-      dependencies: >
-        [
-          {"dependency": "vs_build"}
-        ]
-    scheduler: luci
 
   - name: Windows plugin_tools_tests
     recipe: plugins/plugins
     timeout: 30
     properties:
       add_recipes_cq: "true"
       target_file: plugin_tools_tests.yaml
-    scheduler: luci
+      channel: master
+      version_file: flutter_master.version
 
   - name: Linux ci_yaml plugins roller
     recipe: infra/ci_yaml
     timeout: 30
-    scheduler: luci
     runIf:
       - .ci.yaml

.ci/Dockerfile

@@ -1,7 +1,7 @@
 # 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:2.2.2
+FROM cirrusci/flutter@sha256:505fe8bce2896c75b4df9ccf500b1604155bf932af7465ffcc66fcae8612f82f
 
 RUN apt-get update -y
 
@@ -41,6 +41,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo ap
 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: has a handler for url_launcher tests.
+# Make Chrome the default so http: and file: has a handler for url_launcher tests.
 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

@@ -0,0 +1 @@
+ec20ea80ad98007bd022648168e7b3cc38b2e665

.ci/scripts/drive_examples_win32.sh

@@ -4,4 +4,4 @@
 # found in the LICENSE file.
 
 dart ./script/tool/bin/flutter_plugin_tools.dart drive-examples --windows \
-   --packages-for-branch --log-timing
+   --exclude=script/configs/exclude_integration_win32.yaml --packages-for-branch --log-timing

.cirrus.yml

@@ -1,29 +1,40 @@
-gcp_credentials: ENCRYPTED[!48cff44dd32e9cc412d4d381c7fe68d373ca04cf2639f8192d21cb1a9ab5e21129651423a1cf88f3fd7fe2125c1cabd9!]
+gcp_credentials: ENCRYPTED[!ebad0a1f4f7a446b77944c33651460a7ab010b4617273cb016cf354eb8fc22aa92e37a3c58bfa4a0c40a799351e027a6!]
 
 # Don't run on release tags since it creates O(n^2) tasks where n is the
-# number of plugins
-only_if: $CIRRUS_TAG == ''
+# number of plugins.
+# Don't run on 'master' since it's a mirror of 'main'.
+only_if: $CIRRUS_TAG == '' && $CIRRUS_BRANCH != 'master'
 env:
   CHANNEL: "master" # Default to master when not explicitly set by a task.
   PLUGIN_TOOL: "./script/tool/bin/flutter_plugin_tools.dart"
 
 tool_setup_template: &TOOL_SETUP_TEMPLATE
   tool_setup_script:
-    - git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
+    - git fetch origin main # To set FETCH_HEAD for "git merge-base" to work
     - cd script/tool
     - dart pub get
 
 flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
   upgrade_flutter_script:
+    # Master uses a pinned, auto-rolled version to prevent out-of-band CI
+    # failures due to changes in Flutter.
+    # TODO(stuartmorgan): Investigate an autoroller for stable as well.
+    - TARGET_TREEISH=$CHANNEL
+    - if [[ "$CHANNEL" == "master" ]]; then
+    -   TARGET_TREEISH=$(< .ci/flutter_$CHANNEL.version)
+    - fi
     # Ensure that the repository has all the branches.
     - cd $FLUTTER_HOME
     - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
     - git fetch origin
-    # Switch to the requested branch.
-    - git checkout $CHANNEL
-    # Reset to upstream branch, rather than using pull, since the base image
-    # can sometimes be in a state where it has diverged from upstream (!).
-    - git reset --hard @{u}
+    # Switch to the requested channel.
+    - git checkout $TARGET_TREEISH
+    # When using a branch rather than a hash or version tag, reset to the
+    # upstream branch rather than using pull, since the base image can sometimes
+    # be in a state where it has diverged from upstream (!).
+    - if [[ "$TARGET_TREEISH" == "$CHANNEL" ]] && [[ "$CHANNEL" != *"."* ]]; then
+    -   git reset --hard @{u}
+    - fi
     # Run doctor to allow auditing of what version of Flutter the run is using.
     - flutter doctor -v
   << : *TOOL_SETUP_TEMPLATE
@@ -75,22 +86,29 @@ task:
         CHANGE_DESC: "$TMPDIR/change-description.txt"
       version_check_script:
         # For pre-submit, pass the PR description to the script to allow for
-        # platform version breaking version change justifications.
-        # For post-submit, ignore platform version breaking version changes.
-        # The PR description isn't reliably part of the commit message, so using
-        # the same flags as for presubmit would likely result in false-positive
-        # post-submit failures.
+        # version check overrides.
+        # For post-submit, ignore platform version breaking version changes and
+        # missing version/CHANGELOG detection; the PR description isn't reliably
+        # part of the commit message, so using the same flags as for presubmit
+        # would likely result in false-positive post-submit failures.
         - if [[ $CIRRUS_PR == "" ]]; then
         -   ./script/tool_runner.sh version-check --ignore-platform-interface-breaks
         - else
         -   echo "$CIRRUS_CHANGE_MESSAGE" > "$CHANGE_DESC"
-        -   ./script/tool_runner.sh version-check --change-description-file="$CHANGE_DESC"
+        -   ./script/tool_runner.sh version-check --check-for-missing-changes --change-description-file="$CHANGE_DESC"
         - fi
       publish_check_script: ./script/tool_runner.sh publish-check
     - name: format
       always:
         format_script: ./script/tool_runner.sh format --fail-on-change
         pubspec_script: ./script/tool_runner.sh pubspec-check
+        readme_script:
+          - ./script/tool_runner.sh readme-check
+          # Re-run with --require-excerpts, skipping packages that still need
+          # to be converted. Once https://github.com/flutter/flutter/issues/102679
+          # 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
     - name: federated_safety
       # This check is only meaningful for PRs, as it validates changes
@@ -109,21 +127,44 @@ task:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
-      tool_script:
+      analyze_tool_script:
         - cd script/tool
         - dart analyze --fatal-infos
-      script:
+      analyze_script:
         # DO NOT change the custom-analysis argument here without changing the Dart repo.
         # See the comment in script/configs/custom_analysis.yaml for details.
         - ./script/tool_runner.sh analyze --custom-analysis=script/configs/custom_analysis.yaml
-    ### Android tasks ###
-    - name: android-build_all_plugins
+      pathified_analyze_script:
+        # Re-run analysis with path-based dependencies to ensure that publishing
+        # the changes won't break analysis of other packages in the respository
+        # that depend on it.
+        - ./script/tool_runner.sh make-deps-path-based --target-dependencies-with-non-breaking-updates
+        # 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
+        # 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.
+    # 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
+      depends_on: analyze
       env:
-        BUILD_ALL_ARGS: "apk"
         matrix:
-          CHANNEL: "master"
-          CHANNEL: "stable"
-      << : *BUILD_ALL_PLUGINS_APP_TEMPLATE
+          CHANNEL: "2.10.5"
+          CHANNEL: "2.8.1"
+      analyze_script:
+        - ./script/tool_runner.sh analyze --skip-if-not-supporting-flutter-version="$CHANNEL" --custom-analysis=script/configs/custom_analysis.yaml
+    - name: readme_excerpts
+      env:
+        CIRRUS_CLONE_SUBMODULES: true
+      script: ./script/tool_runner.sh update-excerpts --fail-on-change
     ### Web tasks ###
     - name: web-build_all_plugins
       env:
@@ -183,7 +224,7 @@ task:
           CHANNEL: "master"
           CHANNEL: "stable"
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
-        GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[!c9446a7b11d5520c2ebce3c64ccc82fe6d146272cb06a4a4590e22c389f33153f951347a25422522df1a81fe2f085e9a!]
+        GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[4c11f1a80a5741d51e92ab609bc7214ab2aa015e68a490e4d6777ebdf84f9c899b97c0ded2f4b2e6adf2c8b5ead1e3c5]
       build_script:
         # Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
         # might include non-ASCII characters which makes Gradle crash.
@@ -226,6 +267,13 @@ task:
           path: "**/reports/lint-results-debug.xml"
           type: text/xml
           format: android-lint
+    - name: android-build_all_plugins
+      env:
+        BUILD_ALL_ARGS: "apk"
+        matrix:
+          CHANNEL: "master"
+          CHANNEL: "stable"
+      << : *BUILD_ALL_PLUGINS_APP_TEMPLATE
     ### Web tasks ###
     - name: web-platform_tests
       env:
@@ -235,13 +283,15 @@ task:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
+        CHROME_NO_SANDBOX: true
+        CHROME_DIR: /tmp/web_chromium/
+        CHROME_EXECUTABLE: $CHROME_DIR/chrome-linux/chrome
       install_script:
-        - git clone https://github.com/flutter/web_installers.git
-        - cd web_installers/packages/web_drivers/
-        - dart pub get
+        # Install a pinned version of Chromium and its corresponding ChromeDriver.
+        # Setting CHROME_EXECUTABLE above causes this version to be used for tests.
+        - ./script/install_chromium.sh "$CHROME_DIR"
       chromedriver_background_script:
-        - cd web_installers/packages/web_drivers/
-        - dart lib/web_driver_installer.dart chromedriver --install-only
+        - cd "$CHROME_DIR"
         - ./chromedriver/chromedriver --port=4444
       build_script:
         - ./script/tool_runner.sh build-examples --web
@@ -284,8 +334,11 @@ task:
         - ./script/tool_runner.sh build-examples --ios
       xcode_analyze_script:
         - ./script/tool_runner.sh xcode-analyze --ios
+      xcode_analyze_deprecation_script:
+        # Ensure we don't accidentally introduce deprecated code.
+        - ./script/tool_runner.sh xcode-analyze --ios --ios-min-version=13.0
       native_test_script:
-        - ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest" --exclude=script/configs/exclude_native_ios.yaml
+        - ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest"
       drive_script:
         # `drive-examples` contains integration tests, which changes the UI of the application.
         # This UI change sometimes affects `xctest`.
@@ -312,7 +365,10 @@ task:
         - ./script/tool_runner.sh build-examples --macos
       xcode_analyze_script:
         - ./script/tool_runner.sh xcode-analyze --macos
+      xcode_analyze_deprecation_script:
+        # Ensure we don't accidentally introduce deprecated code.
+        - ./script/tool_runner.sh xcode-analyze --macos --macos-min-version=12.3
       native_test_script:
-        - ./script/tool_runner.sh native-test --macos --exclude=script/configs/exclude_native_macos.yaml
+        - ./script/tool_runner.sh native-test --macos
       drive_script:
-        - ./script/tool_runner.sh drive-examples --macos
+        - ./script/tool_runner.sh drive-examples --macos --exclude=script/configs/exclude_integration_macos.yaml

.clang-format

@@ -1 +1,9 @@
 BasedOnStyle: Google
+---
+Language: Cpp
+DerivePointerAlignment: false
+PointerAlignment: Left
+---
+Language: ObjC
+DerivePointerAlignment: false
+PointerAlignment: Right