Merge branch 'main' into pvc_2

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,13 +18,13 @@
 If you need help, consider asking for advice on the #hackers-new channel on [Discord].
 
 <!-- Links -->
-[Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
-[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
-[test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests
-[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
+[Contributor Guide]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#overview
+[Tree Hygiene]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md
+[test-exempt]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#tests
+[Flutter Style Guide]: https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md
 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
-[testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine
+[testing the engine]: https://github.com/flutter/engine/blob/main/docs/testing/Testing-the-engine.md
 [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
+[breaking change policy]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#handling-breaking-changes
+[Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md

DEPS

@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': 'ded8ab47ee69051fd29711ae86d33e8fee119ebb',
+  'skia_revision': 'bd7d952398d511dbba69346c912eccd445126d5d',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,27 +56,26 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': 'df716eaa6ed2c4778cea0bcb449e023c7ccd3a73',
+  'dart_revision': '1a28e6c86b09f1c83365f54388c32ed97c9e9b31',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
   'dart_binaryen_rev': '93883fde36ac158fd415dcd6dbd387dcfd928d3c',
-  'dart_boringssl_gen_rev': 'fef055e8d2749b82c79c8f043be1cbe5e8e4b40c',
-  'dart_boringssl_rev': '2db0eb3f96a5756298dcd7f9319e56a98585bd10',
-  'dart_core_rev': '1de837279d3c4ce21fef2a5af8a7f0b668ef3d85',
-  'dart_devtools_rev': '3642846c465888b0c56271fe9265a0901f1803f6',
+  'dart_boringssl_rev': 'bb13a96931dd90d6570fa6151e19ef426d5c641f',
+  'dart_core_rev': '7f9f597e64fa52faebd3c0a2214f61a7b081174d',
+  'dart_devtools_rev': '3e5327a02693b1405359dc5322d7f0a40151b9b7',
   'dart_http_rev': '79470d014b467f01b0e7c5b63ab6c86b22dec8db',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
-  'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
-  'dart_pub_rev': '8c2e621c2403cb503cc9959be387d1061a16846a',
-  'dart_tools_rev': 'a6603a45374fc2ed9de4cf0297bde003f141dc9b',
-  'dart_watcher_rev': '7a15a903f7ce0737cce7d08ff30402d41b9f7b62',
-  'dart_web_rev': '8d243766b45c163a9d18a89de059eba24398d163',
+  'dart_protobuf_rev': 'da7279c56734cffed4deb1e3a6f93bdcefccf6b8',
+  'dart_pub_rev': '30bfc439fedba1ee3daadcf542f1483479bc4909',
+  'dart_tools_rev': '223daf5300a5e3f6e09b7e24a5fda1009d6708f7',
+  'dart_watcher_rev': 'bc44e6f6b85972e516c44b9ae6c042b4cbd7c72b',
+  'dart_web_rev': 'bdf112ec64d28285cc29c6c78274ff3a827bb79b',
   'dart_webdev_rev': '5f30c560dc4e3df341356c43ec1a766ee6b74a7c',
-  'dart_webkit_inspection_protocol_rev': 'a834c3b700ead5f1157740d6585ab374f8af1507',
-  'dart_yaml_edit_rev': '8bd0fdfbe1e5119367500543d68be10691efce58',
+  'dart_webkit_inspection_protocol_rev': 'effa75205516757795683d527c3dea9546eb0c32',
+  'dart_yaml_edit_rev': 'fbdc70acc164af187772e013a2e1364cd05b88dc',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
 
@@ -151,7 +150,6 @@ vars = {
   "upstream_angle": "https://github.com/google/angle.git",
   "upstream_archive": "https://github.com/brendan-duncan/archive.git",
   "upstream_benchmark": "https://github.com/google/benchmark.git",
-  "upstream_boringssl_gen": "https://github.com/dart-lang/boringssl_gen.git",
   "upstream_boringssl": "https://github.com/openssl/openssl.git",
   "upstream_brotli": "https://github.com/google/brotli.git",
   "upstream_buildroot": "https://github.com/flutter/buildroot.git",
@@ -229,7 +227,7 @@ vars = {
   # The version / instance id of the cipd:chromium/fuchsia/test-scripts which
   # will be used altogether with fuchsia-sdk to setup the build / test
   # environment.
-  'fuchsia_test_scripts_version': 'OA7UxNZkbxCRfr80Axs8YyBcKZHGw5iUxDDbxiXXTAEC',
+  'fuchsia_test_scripts_version': 'r9Dc5VRF6sE3pJH20k2d1Yko3xSlwljH_nuw7O8vcb4C',
 
   # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
   # used altogether with fuchsia-sdk to generate gn based build rules.
@@ -296,9 +294,6 @@ deps = {
   'src/flutter/third_party/googletest':
    Var('chromium_git') + '/external/github.com/google/googletest' + '@' + '7f036c5563af7d0329f20e8bb42effb04629f0c0',
 
-  'src/flutter/third_party/boringssl':
-   Var('dart_git') + '/boringssl_gen.git' + '@' + Var('dart_boringssl_gen_rev'),
-
   'src/flutter/third_party/brotli':
    Var('skia_git') + '/external/github.com/google/brotli.git' + '@' + '350100a5bb9d9671aca85213b2ec7a70a361b0cd',
 
@@ -328,25 +323,25 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@93883fde36ac158fd415dcd6dbd387dcfd928d3c',
 
   'src/flutter/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:3642846c465888b0c56271fe9265a0901f1803f6'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:3e5327a02693b1405359dc5322d7f0a40151b9b7'}]},
 
   'src/flutter/third_party/dart/third_party/pkg/core':
    Var('dart_git') + '/core.git' + '@' + Var('dart_core_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/dart_style':
-   Var('dart_git') + '/dart_style.git@f6d020e48cc531a0967c91fa88028c086fedfbf9',
+   Var('dart_git') + '/dart_style.git@1de89eb3bd340315f9ff5f2afc319cc1d6131b8d',
 
   'src/flutter/third_party/dart/third_party/pkg/dartdoc':
    Var('dart_git') + '/dartdoc.git@c7f11603effa88ddacabfd555993f322fca8b3fe',
 
   'src/flutter/third_party/dart/third_party/pkg/glob':
-   Var('dart_git') + '/glob.git@b6319d6c2880b44039e75dfed80f7ce150f76d51',
+   Var('dart_git') + '/glob.git@994191a107b99a1911a3ef52ca238cd9305c8d37',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
    Var('dart_git') + '/http.git' + '@' + Var('dart_http_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
-   Var('dart_git') + '/http_multi_server.git@c8aabe36268aa38c906eae46728c10d883b9aced',
+   Var('dart_git') + '/http_multi_server.git@f6a748819139b8cbf513d5fc36b10676b0cb066f',
 
   'src/flutter/third_party/dart/third_party/pkg/intl':
    Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
@@ -355,16 +350,16 @@ deps = {
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'src/flutter/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@776689c8749ebddd4ea0ec899085bd2aae0e25ba',
+   Var('dart_git') + '/markdown.git@4d5dbc659955973902f2585c54e94d453532db70',
 
   'src/flutter/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@51647776372aa9e1f839efb811aa959fe445c0cf',
+   Var('dart_git') + '/native.git@8ea1a9db0af42933eb22334c4506ca464d7237e9',
 
   'src/flutter/third_party/dart/third_party/pkg/package_config':
-   Var('dart_git') + '/package_config.git@2583a4e2f9382409ba3bcfa4887ef2a2a8a2aee3',
+   Var('dart_git') + '/package_config.git@76f2f6c245451da1fa24d7bbb00251b909e729a5',
 
   'src/flutter/third_party/dart/third_party/pkg/pool':
-   Var('dart_git') + '/pool.git@0bac9b20ef61ad8bfdd6b92b565dd12e8e2e2c78',
+   Var('dart_git') + '/pool.git@f85209d83cb0aa3c5612ed80de32df51ba580abd',
 
   'src/flutter/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -373,40 +368,40 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/pub_semver':
-   Var('dart_git') + '/pub_semver.git@ab3eab50cc9f3df650ba7f5571aa2a1ea715dcc8',
+   Var('dart_git') + '/pub_semver.git@8e9fcb9d3f89f06022387f906da4d380688f935c',
 
   'src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@a2708cd8bce88d5e6391b1cb5bbe80b5a072c55a',
+   Var('dart_git') + '/shelf.git@2b5b683e78f5cc84e479a43297fd7b5489d7db02',
 
   'src/flutter/third_party/dart/third_party/pkg/source_maps':
-   Var('dart_git') + '/source_maps.git@b20b97003a48d78a1ecba7e46d932ea4b480dd94',
+   Var('dart_git') + '/source_maps.git@198d32bbde2f5736c04dfbab306a17096fd1648b',
 
   'src/flutter/third_party/dart/third_party/pkg/source_span':
-   Var('dart_git') + '/source_span.git@f147469ba02108c1ade3680de548b7b447de8c72',
+   Var('dart_git') + '/source_span.git@22a243eb50d926935a8a1300a49af6d2988c3ae6',
 
   'src/flutter/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@befbd6d35118f59525903242db3888942ac34180',
+   Var('dart_git') + '/sse.git@b97dc3ad9a58a454dc5ffe5b3ec814dadc389e32',
 
   'src/flutter/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@63e79f584567f7c73e7f5739c7cfd8e748f51f16',
+   Var('dart_git') + '/stack_trace.git@b660cfa444d46bcceb3a0eacbd6a2a7829da11de',
 
   'src/flutter/third_party/dart/third_party/pkg/stream_channel':
-   Var('dart_git') + '/stream_channel.git@9bfc2a8dec202bcd07332f39df0f905c670092c6',
+   Var('dart_git') + '/stream_channel.git@71fe6dd315e7f451466da80f7af2661cd28aaaea',
 
   'src/flutter/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@255d67111e3ed67caedba2789269b6344bf62638',
+   Var('dart_git') + '/string_scanner.git@77de235c061a09264cae920e52939787325c8cae',
 
   'src/flutter/third_party/dart/third_party/pkg/tar':
    Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
 
   'src/flutter/third_party/dart/third_party/pkg/term_glyph':
-   Var('dart_git') + '/term_glyph.git@31abb04b735395ba98db3dd4a360b85729dfddfa',
+   Var('dart_git') + '/term_glyph.git@9ed8ed96fdd84cb7b72ee1be3e86010969fa95d4',
 
   'src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@8a07bee398833ca38ca4c88905ccdbd513f40705',
+   Var('dart_git') + '/test.git@dc0f8ea4d09aabb0fed16daea3d4653c8f967b02',
 
   'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
-   Var('dart_git') + '/test_reflective_loader.git@30a552df6421e1f68cdc33c98c2512984b6f42b9',
+   Var('dart_git') + '/test_reflective_loader.git@faade6299d1823f0d062eb5e98f3b440ddcea7c6',
 
   'src/flutter/third_party/dart/third_party/pkg/tools':
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -418,7 +413,7 @@ deps = {
    Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@abe77eabb6566a2d5129d1178ef2e342ca578e64',
+   Var('dart_git') + '/web_socket_channel.git@7a2039fd7c4c656ab27850926f89103b5f188dab',
 
   'src/flutter/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -427,7 +422,7 @@ deps = {
    Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/yaml':
-   Var('dart_git') + '/yaml.git@402655e84389bd1a4208000d75c16d1e5faeb443',
+   Var('dart_git') + '/yaml.git@2a3727288a9336b6f9b7c5236657414ce1ee5d8a',
 
   'src/flutter/third_party/dart/third_party/pkg/yaml_edit':
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
@@ -875,7 +870,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'D5CBHuB2c-v3Zai-ctZfl5OU4d13Q1Af5LYFMrzdpVIC'
+        'version': '5taAI9-tnFN84ZJvrs2E-sXIhxas7Bw7jxCrLtzcnaEC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

analysis_options.yaml

@@ -23,6 +23,9 @@ analyzer:
     - third_party
     - shell/platform/fuchsia
 
+formatter:
+  page_width: 100
+
 linter:
   rules:
     # This list is derived from the list of all available lints located at

ci/bin/format.dart

@@ -6,6 +6,7 @@
 //
 // Run with --help for usage.
 
+import 'dart:ffi';
 import 'dart:io';
 
 import 'package:args/args.dart';
@@ -312,17 +313,15 @@ class ClangFormatChecker extends FormatChecker {
     super.allFiles,
     super.messageCallback,
   }) {
-    /*late*/ String clangOs;
-    if (Platform.isLinux) {
-      clangOs = 'linux-x64';
-    } else if (Platform.isMacOS) {
-      clangOs = 'mac-x64';
-    } else if (Platform.isWindows) {
-      clangOs = 'windows-x64';
-    } else {
-      throw FormattingException(
-          "Unknown operating system: don't know how to run clang-format here.");
-    }
+    final clangOs = switch (Abi.current()) {
+      Abi.linuxArm64 => 'linux-arm64',
+      Abi.linuxX64 => 'linux-x64',
+      Abi.macosArm64 => 'mac-arm64',
+      Abi.macosX64 => 'mac-x64',
+      Abi.windowsX64 => 'windows-x64',
+      (_) => throw FormattingException(
+          "Unknown operating system: don't know how to run clang-format here.")
+    };
     clangFormat = File(
       path.join(
         srcDir.absolute.path,

ci/format.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright 2013 The Flutter Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be