Merge remote-tracking branch 'upstream/master' into ios-textinputplugin-arc

Author: LongCatIsLooong

.ci.yaml

@@ -181,6 +181,8 @@ targets:
   - name: Linux Host Engine
     recipe: engine/engine
     properties:
+      gclient_variables: >-
+        {"download_emsdk": true}
       add_recipes_cq: "true"
       build_host: "true"
     timeout: 60
@@ -286,7 +288,7 @@ targets:
       dependencies: >-
         [
           {"dependency": "chrome_and_driver", "version": "version:107.0"},
-          {"dependency": "firefox", "version": "version:83.0"},
+          {"dependency": "firefox", "version": "version:106.0"},
           {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
         ]
     timeout: 60
@@ -337,6 +339,8 @@ targets:
   - name: Mac Host Engine
     recipe: engine/engine
     properties:
+      gclient_variables: >-
+        {"download_emsdk": true}
       add_recipes_cq: "true"
       build_host: "true"
       jazzy_version: "0.14.1"
@@ -375,6 +379,7 @@ targets:
     recipe: engine/engine_lint
     properties:
       add_recipes_cq: "true"
+      cores: "12"
       jazzy_version: "0.14.1"
       lint_host: "true"
       lint_ios: "false"
@@ -486,6 +491,8 @@ targets:
     recipe: engine/engine
     timeout: 60
     properties:
+      gclient_variables: >-
+        {"download_emsdk": true}
       add_recipes_cq: "true"
       build_host: "true"
 

.github/workflows/scorecards-analysis.yml

@@ -11,7 +11,7 @@ permissions: read-all
 jobs:
   vuln-scan:
     name: Vulnerability scanning
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     if: ${{ github.repository == 'flutter/engine' }}
     steps:
       - name: "Checkout code"
@@ -65,6 +65,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898
+        uses: github/codeql-action/upload-sarif@b2a92eb56d8cb930006a1c6ed86b0782dd8a4297
         with:
           sarif_file: results.sarif

.github/workflows/third_party_scan.yml

@@ -51,6 +51,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@a3a6c128d771b6b9bdebb1c9d0583ebd2728a108
+        uses: github/codeql-action/upload-sarif@b2a92eb56d8cb930006a1c6ed86b0782dd8a4297
         with:
           sarif_file: osvReport.sarif

DEPS

@@ -18,7 +18,7 @@ vars = {
   'llvm_git': 'https://llvm.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': 'a82a7b6da0a084fd852cae8554ea2f90a3bfa465',
+  'skia_revision': 'f549128104babe451bacf60e5851dbf73b2940d6',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -48,22 +48,22 @@ 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': '962cd6e0d20a8e63b679bbb93ee1c159b6599073',
+  'dart_revision': '1dd5b1bf109903f5991749301433557fc89d7bb3',
 
   # 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': 'ec53f4b2d5b0d52ae703c5b696ecf052ad5fffbb',
+  'dart_binaryen_rev': '7769139efbe818c7ba36d1a382db5114ebee9df8',
   'dart_boringssl_gen_rev': 'ced85ef0a00bbca77ce5a91261a5f2ae61b1e62f',
   'dart_boringssl_rev': '87f316d7748268eb56f2dc147bd593254ae93198',
   'dart_browser_launcher_rev': '5fa0bd6cddc33785f43c920576fc03dcee1c3caa',
   'dart_clock_rev': '8a8231fa7912d84c7e99236b7800cfbef5ea7ae5',
-  'dart_collection_rev': 'efd709fc1760a595f8575f4137a1847de1b49d76',
-  'dart_devtools_rev': '23444af89d716818f099974df3e4fffac87fd886',
-  'dart_protobuf_rev': 'ae90e53cd690edbfc72fa6c293fdb7b4a09ee0a2',
-  'dart_pub_rev': '6ac42d7644dedfcc500147ab47886eecab4b1b38',
+  'dart_collection_rev': 'cdb11d410b67279d81673def5a8a78dfc0dec2eb',
+  'dart_devtools_rev': 'dd3fade2bd2ef74fc6102e56333a48f0efc594d3',
+  'dart_protobuf_rev': '2706b53d2175b5e1081603059ef1b7b30956f6b8',
+  'dart_pub_rev': '21aa23f148a428ae4dd97a27ecc70b08c1328089',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
   'dart_watcher_rev': '32591071a83f632478e702f67e29de6e54428ce9',
-  'dart_webdev_rev': '3ec168f6815af9d5f11278111d147bc82c0755c3',
+  'dart_webdev_rev': '3e2364ee3539ae08f350d03a3a5f3c22aa74d994',
   'dart_webkit_inspection_protocol_rev': 'ddb624cd85954dd384056cc253a8fc2b9da5364d',
   'dart_yaml_edit_rev': '299f74594ff9fda412c1da5c0b5d5231d0c6fc42',
   'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
@@ -148,6 +148,7 @@ vars = {
   "upstream_http_parser": "https://github.com/dart-lang/http_parser.git",
   "upstream_http": "https://github.com/dart-lang/http.git",
   "upstream_icu": "https://github.com/unicode-org/icu.git",
+  "upstream_intl": "https://github.com/dart-lang/intl.git",
   "upstream_imgui": "https://github.com/ocornut/imgui.git",
   "upstream_inja": "https://github.com/pantor/inja.git",
   "upstream_json": "https://github.com/nlohmann/json.git",
@@ -235,7 +236,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'f63462fc605c94da9301d7263ce1b1f53bf4188a',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '012a58f159c736a21d9c40a6b98f69e3a9910169',
 
    # Fuchsia compatibility
    #
@@ -256,7 +257,7 @@ deps = {
    Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',
 
   'src/third_party/glfw':
-   Var('fuchsia_git') + '/third_party/glfw' + '@' + '78e6a0063d27ed44c2c4805606309744f6fb29fc',
+   Var('fuchsia_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127',
 
   'src/third_party/shaderc':
    Var('github_git') + '/google/shaderc.git' + '@' + '7ea834ecc59258a5c13c3d3e6fa0582bdde7c543',
@@ -297,10 +298,10 @@ deps = {
   # WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
 
   'src/third_party/dart/third_party/binaryen/src':
-   Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@ec53f4b2d5b0d52ae703c5b696ecf052ad5fffbb',
+   Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@7769139efbe818c7ba36d1a382db5114ebee9df8',
 
   'src/third_party/dart/third_party/devtools':
-   {'packages': [{'version': 'git_revision:23444af89d716818f099974df3e4fffac87fd886', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'git_revision:dd3fade2bd2ef74fc6102e56333a48f0efc594d3', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
 
   'src/third_party/dart/third_party/pkg/args':
    Var('dart_git') + '/args.git@da037acc018a8dd267d109eb634454490b7ff759',
@@ -336,19 +337,19 @@ deps = {
    Var('dart_git') + '/csslib.git@34203c09f073ed8267f5d6e333daddb02e6ff609',
 
   'src/third_party/dart/third_party/pkg/dart_style':
-   Var('dart_git') + '/dart_style.git@f79a9828ad07e50d6e8352ac154cc16eb4d78d5c',
+   Var('dart_git') + '/dart_style.git@bc86574772350fa7d4cd4fa334b6652f08f750ba',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@dc502d0862fe1ba8451c9c57cd7ab70432634af3',
+   Var('dart_git') + '/dartdoc.git@eb90a44c54fa01f0d501bf6e861a34857d843cea',
 
   'src/third_party/dart/third_party/pkg/ffi':
-   Var('dart_git') + '/ffi.git@3ede2312dd6ec37db6e7bcd6e1236647f72c7fc0',
+   Var('dart_git') + '/ffi.git@17a8142da8114a065e03200467c7657b5368a86d',
 
   'src/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@b768f79dcd104a5feabafab47101c4355b71cd8f',
 
   'src/third_party/dart/third_party/pkg/fixnum':
-   Var('dart_git') + '/fixnum.git@bca3816daf641397f7b5ab9cf865a6d10d30c625',
+   Var('dart_git') + '/fixnum.git@e4f5e9773de053adcb03bff9f02fa6f9c596fe4c',
 
   'src/third_party/dart/third_party/pkg/glob':
    Var('dart_git') + '/glob.git@7f97bf5be6bfe8c90a92283e4c590dba2a676083',
@@ -357,28 +358,31 @@ deps = {
    Var('dart_git') + '/html.git@28fb8b97acf471bedcfa4eaf38899a0f65d5e30d',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@d56141de40b69e8ae3cc22602caea6cca3fba4dc',
+   Var('dart_git') + '/http.git@46a7708b2075a807d44afbe39496e1c0c7802f4e',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@e31c6988e3869fb4019429254604066338f86095',
 
   'src/third_party/dart/third_party/pkg/http_parser':
    Var('dart_git') + '/http_parser.git@c73967535ce31120e218120f70ef98cc22688c82',
 
+  'src/third_party/dart/third_party/pkg/intl':
+   Var('dart_git') + '/intl.git@234b291aee7c23c9ffc9748fd6532d37553f609b',
+
   'src/third_party/dart/third_party/pkg/json_rpc_2':
    Var('dart_git') + '/json_rpc_2.git@16fed53fbebd38edf170f58c1da1de2a325b2b98',
 
   'src/third_party/dart/third_party/pkg/linter':
-   Var('dart_git') + '/linter.git@8bce8b8b06c22716219207eb9d52beb93932ea44',
+   Var('dart_git') + '/linter.git@7fe671cdadb52139295bae0abf62c014369af93a',
 
   'src/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@f322480fb9d9e83e677c08db6d09067059f7ff74',
+   Var('dart_git') + '/logging.git@0373ef85aa1dfe9e179b9fa006c45b65903787f2',
 
   'src/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@37951d151750acfae756b2e466f563c1c5119b3d',
+   Var('dart_git') + '/markdown.git@ee3f4e976efcfed87c6ec78364bc2dd3c6e717b9',
 
   'src/third_party/dart/third_party/pkg/matcher':
-   Var('dart_git') + '/matcher.git@15d4af21002ae9adee952110192a3face96307c7',
+   Var('dart_git') + '/matcher.git@7e6a665da079baa3e2a2046ab02e4353ee32556c',
 
   'src/third_party/dart/third_party/pkg/mime':
    Var('dart_git') + '/mime.git@c0c4c47a3d7bf696f1aa1959fb83d598baadb33c',
@@ -402,10 +406,10 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'src/third_party/dart/third_party/pkg/pub_semver':
-   Var('dart_git') + '/pub_semver.git@28159b8c5b96fc2709d0904389d7932880f68659',
+   Var('dart_git') + '/pub_semver.git@17231113f98c80285881cc4452863bcfd085d1a8',
 
   'src/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@1c2104737973715426035c11ba840c7f23d8f186',
+   Var('dart_git') + '/shelf.git@32e342d2498db739d2d79123cecd8f2e8d598c3b',
 
   'src/third_party/dart/third_party/pkg/source_map_stack_trace':
    Var('dart_git') + '/source_map_stack_trace.git@8d8078fcc81c8f7936805cd277198493e0b7fc62',
@@ -417,10 +421,10 @@ deps = {
    Var('dart_git') + '/source_span.git@d1d47e550b6f77ed9b4907339a8a5e430b9ca314',
 
   'src/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@283568dd4865cc51e25370ed107fcbdb68759c22',
+   Var('dart_git') + '/sse.git@d3961459442816273dacaae4136dfe5900f34955',
 
   'src/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@dce00134f6558086e8963e37d0b1ba0830862c01',
+   Var('dart_git') + '/stack_trace.git@cf3562e0bf1796d4a801ed345408fcbc929dea70',
 
   'src/third_party/dart/third_party/pkg/stream_channel':
    Var('dart_git') + '/stream_channel.git@914304769d036867b993bd7f9c111145f1ca4ab0',
@@ -432,7 +436,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@822cd5b3418615c6db715a796c2c9ba9acb63b0d',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@7756833000d671d4540b37ef04acd4b9e716026f',
+   Var('dart_git') + '/test.git@09fb067979684dbd0918f664ec4d178975c84283',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@52b6753852661787208e003f9716b079026c7ac7',
@@ -462,7 +466,7 @@ deps = {
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
 
   'src/third_party/dart/tools/sdks':
-   {'packages': [{'version': 'version:2.18.0', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'version:2.19.0-374.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -634,7 +638,7 @@ deps = {
   Var('dart_git') + '/external/github.com/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0
 
   'src/third_party/imgui':
-  Var('github_git') + '/ocornut/imgui.git' + '@' + '29d462ebce0275345a6ce4621d8fff0ded57c9e5',
+  Var('github_git') + '/ocornut/imgui.git' + '@' + '3ea0fad204e994d669f79ed29dcaf61cd5cb571d',
 
   'src/third_party/tinygltf':
   Var('github_git') + '/syoyo/tinygltf.git' + '@' + '9bb5806df4055ac973b970ba5b3e27ce27d98148',
@@ -812,7 +816,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'gF3YVyOjqNbzT-L9YjJk7PPaCBuQmUdqFc8KTbpsqTYC'
+        'version': 'VEOIaacOA75U7PYyzm45DFBJhGj-7o3kEWtE86GtxdwC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -822,7 +826,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'NlJGkMbtZqQ6_BCpu5Mif5-14birO7qsn-VP2ULJK8MC'
+        'version': 'zwfwHRSLdmV61hYqecvVYmk53-hABFbkUNUIMY8ZZVQC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

ci/analyze.sh

@@ -52,6 +52,7 @@ echo ""
 
 "$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/flutter_frontend_server"
 
+(cd "$FLUTTER_DIR/tools/gen_web_locale_keymap"; "$DART" pub get)
 "$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/tools"
 
 (cd "$FLUTTER_DIR/testing/skia_gold_client"; "$DART" pub get)

ci/builders/linux_host_engine.json

@@ -39,7 +39,6 @@
               "debug",
               "--unoptimized",
               "--prebuilt-dart-sdk",
-              "--enable-impeller-vulkan",
               "--target-dir",
               "host_debug_impeller_vulkan"
           ],

ci/builders/mac_ios_engine_release.json

@@ -39,8 +39,7 @@
                 "targets": [
                     "flutter/shell/platform/darwin/ios:flutter_framework",
                     "flutter/lib/snapshot:generate_snapshot_bin"
-                ],
-                "tool": "autoninja"
+                ]
             },
             "tests": []
         },
@@ -63,8 +62,7 @@
             "name": "ios_debug_sim_arm64",
             "ninja": {
                 "config": "ios_debug_sim_arm64",
-                "targets": [],
-                "tool": "autoninja"
+                "targets": []
             },
             "tests": []
         }

ci/format.bat

@@ -28,5 +28,4 @@ cd "%ci_dir%"
 REM Do not use the CALL command in the next line to execute Dart. CALL causes
 REM Windows to re-read the line from disk after the CALL command has finished
 REM regardless of the ampersand chain.
-REM TODO(gspencergoog): Remove --no-sound-null-safety once isolate package is null-safe.
-"%dart%" --no-sound-null-safety --disable-dart-dev bin\format.dart %* & exit /B !ERRORLEVEL!
+"%dart%" --disable-dart-dev bin\format.dart %* & exit /B !ERRORLEVEL!

ci/format.sh

@@ -32,10 +32,8 @@ SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
 DART_SDK_DIR="${SRC_DIR}/third_party/dart/tools/sdks/dart-sdk"
 DART="${DART_SDK_DIR}/bin/dart"
 
-# TODO(gspencergoog): Remove --no-sound-null-safety once isolate package is null-safe.
 cd "$SCRIPT_DIR"
 "$DART" \
   --disable-dart-dev \
-  --no-sound-null-safety \
   bin/format.dart \
   "$@"