Merge branch 'main' into implicit_view_tests

Author: mdebbar

.ci.yaml

@@ -32,12 +32,9 @@ platform_properties:
       device_type: none
       cpu: x86
       os: Mac-12|Mac-13
-      # TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
       $flutter/osx_sdk : >-
         {
-          "sdk_version": "14e300c",
-          "toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
-          "toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
+          "sdk_version": "14e300c"
         }
     dimensions:
       mac_model: "Macmini8,1|Macmini9,1"
@@ -326,7 +323,7 @@ targets:
 
   - name: Linux mac_android_aot_engine
     recipe: engine_v2/engine_v2
-    timeout: 120
+    timeout: 240
     properties:
       add_recipes_cq: "true"
       release_build: "true"
@@ -356,7 +353,7 @@ targets:
 
   - name: Mac mac_host_engine
     recipe: engine_v2/engine_v2
-    timeout: 120
+    timeout: 240
     properties:
       add_recipes_cq: "true"
       release_build: "true"
@@ -366,12 +363,9 @@ targets:
         [
           {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
         ]
-      # TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
       $flutter/osx_sdk : >-
         {
-          "sdk_version": "14e300c",
-          "toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
-          "toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
+          "sdk_version": "14e300c"
         }
     drone_dimensions:
       - os=Mac-12|Mac-13
@@ -385,17 +379,14 @@ targets:
 
   - name: Mac mac_ios_engine
     recipe: engine_v2/engine_v2
-    timeout: 120
+    timeout: 240
     properties:
       add_recipes_cq: "true"
       release_build: "true"
       config_name: mac_ios_engine
-      # TODO(vashworth): Remove specific toolchain_ver once https://github.com/flutter/flutter/issues/138109 is resolved.
       $flutter/osx_sdk : >-
         {
-          "sdk_version": "14e300c",
-          "toolchain_ver_arm": "JiMOaZvCH66lnGWMJdLScE-7lkUnKaw3COdWwqXmjWEC",
-          "toolchain_ver_intel": "Zp2HmSx7_-pu-yHqYqzoEpo0JRwNZGGwSj5V1SnLFmoC"
+          "sdk_version": "14e300c"
         }
     drone_dimensions:
       - os=Mac-12|Mac-13

.github/release.yml

@@ -6,7 +6,7 @@ changelog:
   categories:
     - title: Impeller
       labels:
-        - impeller
+        - "e: impeller"
     - title: Android
       labels:
         - platform-android
@@ -20,3 +20,6 @@ changelog:
       labels:
         - platform-windows
         - platform-macos
+    - title: Other Changes
+      labels:
+        - "*"

.github/workflows/scorecards-analysis.yml

@@ -41,7 +41,7 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
         with:
           name: SARIF file
           path: results.sarif

.github/workflows/third_party_scan.yml

@@ -38,7 +38,7 @@ jobs:
         run: python ci/scan_flattened_deps.py
       # Upload the results as artifacts.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
         with:
           name: SARIF file
           path: osvReport.sarif

BUILD.gn

@@ -114,7 +114,7 @@ group("flutter") {
     public_deps += [
       "//flutter/shell/testing",
       "//flutter/tools/const_finder",
-      "//flutter/tools/font-subset",
+      "//flutter/tools/font_subset",
     ]
   }
 

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': '053490edfa703f3433d97a299ee80f2acc93de71',
+  'skia_revision': '1144b79504040273b7df922b5911326f2b722da4',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -46,7 +46,7 @@ vars = {
   # updates to Clang Tidy will not turn the tree red.
   #
   # See https://github.com/flutter/flutter/wiki/Engine-pre‐submits-and-post‐submits#post-submit
-  'clang_version': 'git_revision:00396e6a1a0b79fda008cb4e86b616d7952b33c8',
+  'clang_version': 'git_revision:725656bdd885483c39f482a01ea25d67acf39c46',
 
   # The goma version and the clang version can be tightly coupled. If goma
   # stops working on a clang roll, this may need to be updated using the value
@@ -66,7 +66,7 @@ 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': '82c4571bb2ded15cca71862158f2a7a78ee9127f',
+  'dart_revision': '7e9f7eab80d34a6c455793c5c9177464a0c0743b',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -76,13 +76,12 @@ vars = {
   'dart_browser_launcher_rev': 'c68ec25e36187b050ac918d2b614f2d6320f0045',
   'dart_clock_rev': 'f975668839f45bad561d6227f88297bbbcff03fa',
   'dart_collection_rev': '2d57a82ad079fe2d127f5a9b188170de2f5cdedc',
-  'dart_devtools_rev': '27795d615e1878ccf5f55c4b90d611e2628a8618',
+  'dart_devtools_rev': '071405a237dab931ea10be728ec188aa2d55111f',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': '20ec6856b65b7fd6445219fdec24d90b414f7469',
   'dart_pub_rev': '1779628b386819675130f14326f1e8812901c48f',
-  'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
   'dart_tools_rev': 'ed81684df747830de8b29e9d6e6d8f951ea6968d',
   'dart_watcher_rev': 'dc45f1925f66743ff29b9dcbb4693a7ec25945c5',
   'dart_webdev_rev': '8375cd66821550cb7a129315d97cd768c5fdd92c',
@@ -169,7 +168,6 @@ vars = {
   "upstream_file": "https://github.com/google/file.dart.git",
   "upstream_fixnum": "https://github.com/dart-lang/fixnum.git",
   "upstream_flatbuffers": "https://github.com/google/flatbuffers.git",
-  "upstream_fontconfig": "https://gitlab.freedesktop.org/fontconfig/fontconfig.git",
   "upstream_freetype2": "https://gitlab.freedesktop.org/freetype/freetype.git",
   "upstream_gcloud": "https://github.com/dart-lang/gcloud.git",
   "upstream_glfw": "https://github.com/glfw/glfw.git",
@@ -195,14 +193,12 @@ vars = {
   "upstream_libpng": "https://github.com/glennrp/libpng.git",
   "upstream_libtess2": "https://github.com/memononen/libtess2.git",
   "upstream_libwebp": "https://chromium.googlesource.com/webm/libwebp.git",
-  "upstream_libxml": "https://gitlab.gnome.org/GNOME/libxml2.git",
   "upstream_leak_tracker": "https://github.com/dart-lang/leak_tracker.git",
   "upstream_logging": "https://github.com/dart-lang/logging.git",
   "upstream_markdown": "https://github.com/dart-lang/markdown.git",
   "upstream_matcher": "https://github.com/dart-lang/matcher.git",
   "upstream_mime": "https://github.com/dart-lang/mime.git",
   "upstream_mockito": "https://github.com/dart-lang/mockito.git",
-  "upstream_oauth2": "https://github.com/dart-lang/oauth2.git",
   "upstream_ocmock": "https://github.com/erikdoe/ocmock.git",
   "upstream_package_config": "https://github.com/dart-lang/package_config.git",
   "upstream_packages": "https://github.com/flutter/packages.git",
@@ -217,7 +213,6 @@ vars = {
   "upstream_pyyaml": "https://github.com/yaml/pyyaml.git",
   "upstream_quiver-dart": "https://github.com/google/quiver-dart.git",
   "upstream_rapidjson": "https://github.com/Tencent/rapidjson.git",
-  "upstream_root_certificates": "https://github.com/dart-lang/root_certificates.git",
   "upstream_sdk": "https://github.com/dart-lang/sdk.git",
   "upstream_shaderc": "https://github.com/google/shaderc.git",
   "upstream_shelf": "https://github.com/dart-lang/shelf.git",
@@ -240,7 +235,6 @@ vars = {
   "upstream_typed_data": "https://github.com/dart-lang/typed_data.git",
   "upstream_usage": "https://github.com/dart-lang/usage.git",
   "upstream_vector_math": "https://github.com/google/vector_math.dart.git",
-  "upstream_Vulkan-Headers": "https://github.com/KhronosGroup/Vulkan-Headers.git",
   "upstream_VulkanMemoryAllocator": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
   "upstream_watcher": "https://github.com/dart-lang/watcher.git",
   "upstream_web_socket_channel": "https://github.com/dart-lang/web_socket_channel.git",
@@ -273,10 +267,10 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e0aa3ae49a32df7dd00655ee4dd55b00d84a47ea',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '0141e94b34cbd3db77f28796587334857fa985da',
 
   'src/flutter/third_party/rapidjson':
-   Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
+   Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
 
   'src/third_party/harfbuzz':
    Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'b61761f36e93c3f1e36c9bed0755acfa7f4e3d4f',
@@ -288,7 +282,7 @@ deps = {
    Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',
 
   'src/flutter/third_party/glfw':
-   Var('fuchsia_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127',
+   Var('flutter_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127',
 
   'src/flutter/third_party/shaderc':
    Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '37e25539ce199ecaf19fb7f7d27818716d36686d',
@@ -339,7 +333,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@a51bd6df919a5b79574f0996a760cc20cb05697e',
 
   'src/third_party/dart/third_party/devtools':
-   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:27795d615e1878ccf5f55c4b90d611e2628a8618'}]},
+   {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:071405a237dab931ea10be728ec188aa2d55111f'}]},
 
   'src/third_party/dart/third_party/pkg/args':
    Var('dart_git') + '/args.git@46d5033377d277d70bc6ec68504730b9384b1db1',
@@ -378,7 +372,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@8b1f24a8475a0116757172cd9acca4acbf87d973',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@53da3e1dd1802c5899352fce251ea0c385a827b0',
+   Var('dart_git') + '/dartdoc.git@3ce64a3d7da6702a4342bdfd0723b750fddeb35a',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git@c926657618443ff4821411ede01684096b503f84',
@@ -429,7 +423,7 @@ deps = {
    Var('dart_git') + '/mockito.git@57a7c820ffae61e3df0dbc279ad98b92751175f0',
 
   'src/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@5aeab2915167fd24ccb1241c07516b388fda2b9b',
+   Var('dart_git') + '/native.git@b668ca94f551fcebdeb3ce9f822170facced55ae',
 
   'src/third_party/dart/third_party/pkg/package_config':
    Var('dart_git') + '/package_config.git@33dd24659147bd7ed2fa87aeacc52d199be766b4',
@@ -576,7 +570,7 @@ deps = {
       }
     ],
     'dep_type': 'cipd',
-    'condition': 'host_os == "win" and download_dart_sdk and not release_candidate'
+    'condition': 'host_os == "win" and download_dart_sdk'
   },
 
   # esbuild download
@@ -627,17 +621,14 @@ deps = {
   'src/third_party/freetype2':
    Var('flutter_git') + '/third_party/freetype2' + '@' + '3bea2761290a1cbe7d8f75c1c5a7ad727f826a66',
 
-  'src/third_party/root_certificates':
-   Var('dart_git') + '/root_certificates.git' + '@' + Var('dart_root_certificates_rev'),
-
   'src/flutter/third_party/skia':
    Var('skia_git') + '/skia.git' + '@' +  Var('skia_revision'),
 
   'src/flutter/third_party/ocmock':
    Var('ocmock_git') + '@' +  Var('ocmock_rev'),
 
   'src/flutter/third_party/libjpeg-turbo/src':
-   Var('fuchsia_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
+   Var('flutter_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
 
   'src/third_party/libpng':
    Var('flutter_git') + '/third_party/libpng' + '@' + '9187b6e12756317f6d44fc669ac11dfc262bd192',
@@ -648,9 +639,6 @@ deps = {
   'src/flutter/third_party/wuffs':
    Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + '600cd96cf47788ee3a74b40a6028b035c9fd6a61',
 
-  'src/third_party/libxml':
-   Var('flutter_git') + '/third_party/libxml' + '@' + 'a143e452b5fc7d872813eeadc8db421694058098',
-
   'src/third_party/zlib':
    Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + Var('dart_zlib_rev'),
 
@@ -664,10 +652,10 @@ deps = {
    Var('flutter_git') + '/third_party/sqlite' + '@' + '0f61bd2023ba94423b4e4c8cfb1a23de1fe6a21c',
 
   'src/flutter/third_party/pyyaml':
-   Var('fuchsia_git') + '/third_party/pyyaml.git' + '@' + '25e97546488eee166b1abb229a27856cecd8b7ac',
+   Var('flutter_git') + '/third_party/pyyaml.git' + '@' + '25e97546488eee166b1abb229a27856cecd8b7ac',
 
-   'src/third_party/swiftshader':
-   Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5b6f768198ce6a6485da31e1be06b5a17a2bf0a0',
+   'src/flutter/third_party/swiftshader':
+   Var('swiftshader_git') + '/SwiftShader.git' + '@' + '2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f',
 
    'src/third_party/angle':
    Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',
@@ -712,7 +700,7 @@ deps = {
   'src/flutter/third_party/tinygltf':
   Var('flutter_git') + '/third_party/tinygltf.git' + '@' + '9bb5806df4055ac973b970ba5b3e27ce27d98148',
 
-  'src/third_party/json':
+  'src/flutter/third_party/json':
   Var('flutter_git') + '/third_party/json.git' + '@' + '17d9eacd248f58b73f4d1be518ef649fe2295642',
 
   'src/flutter/third_party/stb':