Merge remote-tracking branch 'upstream/main' into engine-mono-worskpace-pubspec

Author: matanlurey

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': '0fa58b6ddba090f7d75dfd03ce0509eda7d1396d',
+  'skia_revision': '5f21260470cf4ac328c8f0b2e5b4f93e482f9207',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,7 +56,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': '5df89347bddf47cb5fa829f03d19ed77dd5ec2fd',
+  'dart_revision': 'b5fc85cfcf1bae20d72fc6d8c5d490ff98eead51',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -72,10 +72,10 @@ vars = {
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
   'dart_pub_rev': 'ddc1c2fd2e2a7cd94a0b92ea033961a25f4ad517',
-  'dart_tools_rev': '4321aecf2cb618dceab5d90adf0cb2ef7207169c',
+  'dart_tools_rev': 'e660a68dce659311fb47735ab00365e26fca2fe3',
   'dart_watcher_rev': 'c00fc2a6cd869cdebbc52e00af3d912d25745729',
   'dart_web_rev': '2fe754fb396cb9b87010f0318cfbfc5408346c48',
-  'dart_webdev_rev': 'eccc7d87982b23f666d5e3e09953dca59ca094e4',
+  'dart_webdev_rev': 'c56611255f3f02642da10750448a8c90a9fa7b47',
   'dart_webkit_inspection_protocol_rev': '5740cc91eaeb13a02007b77b128fccf4b056db6e',
   'dart_yaml_edit_rev': '08a146ef8f2c7aba908d2017c9ec840b882c9e51',
 
@@ -380,13 +380,13 @@ deps = {
    Var('dart_git') + '/crypto.git@813e35e913d12e16de67ac57523cd0ff4b07c012',
 
   'src/flutter/third_party/dart/third_party/pkg/csslib':
-   Var('dart_git') + '/csslib.git@23c314bb6b247a71348cfb0987ba0eb29574abb6',
+   Var('dart_git') + '/csslib.git@b70fef222c8a98abca39c3f729ec34632089697e',
 
   'src/flutter/third_party/dart/third_party/pkg/dart_style':
    Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
 
   'src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@6330a13e3da84b710867af26e343d0b1a4381bc1',
+   Var('dart_git') + '/dartdoc.git@88df88c9278ec4ec31df818f3ae33d4f91c8cd64',
 
   'src/flutter/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@07cacaed6679a173e29176747e6ce0325742749f',
@@ -401,7 +401,7 @@ deps = {
    Var('dart_git') + '/html.git@3bc803d7e655491b243418f19300ef0c6112bcea',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@8c325b9ca33d878a86d69c5048a8e6e18379663c',
+   Var('dart_git') + '/http.git@4d8e7ef73d6135a8cc9b5e53db1beb43977d44b0',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@25941e260658efb324de857e6022f418faf9bdd1',
@@ -443,7 +443,7 @@ deps = {
    Var('dart_git') + '/path.git@04807b61c25f98f328b322ec511451f9f86f98bb',
 
   'src/flutter/third_party/dart/third_party/pkg/pool':
-   Var('dart_git') + '/pool.git@88e463600c636a0d8cdb5dc306524ebf04b06baf',
+   Var('dart_git') + '/pool.git@832c5ab5eaee444354a8c796f7998bf744f169af',
 
   'src/flutter/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -452,7 +452,7 @@ 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@a9025f3cc23ebb0f86c0af8759d95306b9133ce0',
+   Var('dart_git') + '/pub_semver.git@dfcad38866fb1e94e8ca91bff3dddd5189fb0794',
 
   'src/flutter/third_party/dart/third_party/pkg/shelf':
    Var('dart_git') + '/shelf.git@2536c15a562cb183dabbc628824a215663830325',
@@ -476,7 +476,7 @@ deps = {
    Var('dart_git') + '/stream_channel.git@b41ff7a25395ace8b23e454e3d1a3459a71306ca',
 
   'src/flutter/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@7b37c1b3d1ca6b581792e6ba385f651573af4a45',
+   Var('dart_git') + '/string_scanner.git@e1cab8f0538b50f6d7180598752cf5a7e07e74db',
 
   'src/flutter/third_party/dart/third_party/pkg/tar':
    Var('dart_git') + '/external/github.com/simolus3/tar.git@552a49d7595e444184d4f91e9afd533aa253a31d',
@@ -494,7 +494,7 @@ deps = {
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/typed_data':
-   Var('dart_git') + '/typed_data.git@d14f9654f7a5d6baa7dcc27691bd0fa56769fb67',
+   Var('dart_git') + '/typed_data.git@85299290551297a28202b6e7a177bb787f790ffd',
 
   'src/flutter/third_party/dart/third_party/pkg/watcher':
    Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
@@ -512,7 +512,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@7873b3fb9f16ec83bc7778fed58615fa91f1f042',
+   Var('dart_git') + '/yaml.git@4cf24ca3bbcb2cd8cbea32fdd355ee5d0a597247',
 
   'src/flutter/third_party/dart/third_party/pkg/yaml_edit':
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
@@ -979,7 +979,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '_6HNhJ6G59VMceKoNUQPbjxtP50hnTcIQ7F5bsOFT_8C'
+        'version': 'WUN7NQK04NjF9fRmfM16ILdIhytQAHB7O1631G4HsIEC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',
@@ -1009,7 +1009,7 @@ deps = {
    },
 
   'src/third_party/impeller-cmake-example': {
-     'url': Var('flutter_git') + '/third_party/impeller-cmake-example.git' + '@' + 'c44e8093972c969acf171be72591e408a85fdc53',
+     'url': Var('flutter_git') + '/third_party/impeller-cmake-example.git' + '@' + '9f8298ec31dcbebbf019bd487888166abf2f55e6',
      'condition': 'download_impeller_cmake_example',
   },
 

build/archives/BUILD.gn

@@ -283,8 +283,8 @@ if (is_mac) {
     output = "$full_platform_name$suffix/gen_snapshot.zip"
     files = [
       {
-        source = "$root_out_dir/gen_snapshot_$target_cpu"
-        destination = "gen_snapshot_$target_cpu"
+        source = "${root_out_dir}/gen_snapshot_${target_cpu}"
+        destination = "gen_snapshot_${target_cpu}"
       },
     ]
   }

ci/licenses_golden/excluded_files

@@ -424,6 +424,7 @@
 ../../../flutter/sky/tools/create_embedder_framework.py
 ../../../flutter/sky/tools/create_full_ios_framework.py
 ../../../flutter/sky/tools/create_ios_framework.py
+../../../flutter/sky/tools/create_macos_binary.py
 ../../../flutter/sky/tools/create_macos_framework.py
 ../../../flutter/sky/tools/create_macos_gen_snapshots.py
 ../../../flutter/sky/tools/create_xcframework.py

ci/licenses_golden/licenses_dart

@@ -1,4 +1,4 @@
-Signature: ef670c4334a44280733b82c2126aefd0
+Signature: 0e4af40f333ea146834d901da41a1124
 
 ====================================================================================================
 LIBRARY: dart
@@ -4753,7 +4753,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/5df89347bddf47cb5fa829f03d19ed77dd5ec2fd
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/bb18127b2a8e1a1afd882efcc38271212b238ff3
 /third_party/fallback_root_certificates/
 
 ====================================================================================================

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: ba8d41ca2ec3714afd8c5735346682be
+Signature: e8a3423781271215a5e149d0e6e6257c
 
 ====================================================================================================
 LIBRARY: etc1
@@ -398,6 +398,7 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js
 FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html
 FILE: ../../../flutter/third_party/skia/package-lock.json
 FILE: ../../../flutter/third_party/skia/relnotes/grvk-shims.md
+FILE: ../../../flutter/third_party/skia/relnotes/scaledimage.md
 FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt
 FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml
 FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl