From 04ec74e561735caaa094266e9c70aea53d729eab Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Wed, 8 May 2024 11:56:04 -0400 Subject: [PATCH] Manual roll Dart SDK from a9cf6a411c71 to b7cad2edae4b (7 revisions) (flutter/engine#52669) Manual roll requested by zra@google.com https://dart.googlesource.com/sdk.git/+log/a9cf6a411c71..b7cad2edae4b 2024-05-08 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.5.0-138.0.dev 2024-05-08 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.5.0-137.0.dev 2024-05-08 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.5.0-136.0.dev 2024-05-07 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.5.0-135.0.dev 2024-05-07 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.5.0-134.0.dev 2024-05-07 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.5.0-133.0.dev 2024-05-07 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.5.0-132.0.dev If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/dart-sdk-flutter-engine Please CC dart-vm-team@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter Engine: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md --- DEPS | 106 +++++++++--------- .../flutter/ci/licenses_golden/licenses_dart | 4 +- .../flutter/sky/packages/sky_engine/LICENSE | 2 +- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/DEPS b/DEPS index a9e03a34dab..0fc578c5945 100644 --- a/DEPS +++ b/DEPS @@ -56,28 +56,28 @@ 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': 'a9cf6a411c717916c4a170fcf7f6836a93a8ea04', + 'dart_revision': 'b7cad2edae4bcbe05332c9956a04692d19798904', # 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': '9784f012848a7eb321c2037bdb363dfe0eab8bc9', + 'dart_binaryen_rev': '4b7c610f14329dfe045534ec1cde7f28330393f9', 'dart_boringssl_gen_rev': '9c7294fd58261a79794f5afaa26598cf1442ad20', 'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767', - 'dart_browser_launcher_rev': 'c4b2c81aa9debcce3651eda1b68a9bc5d5adf400', - 'dart_clock_rev': 'a732a09149708ae0b986bec9931576d22818d158', - 'dart_collection_rev': 'fc616ff8fd7b732c07b2b19e31b6601e59900ccf', - 'dart_devtools_rev': '486dae7785dc0bda5cc0c463ab704e469bb03f1a', + 'dart_browser_launcher_rev': '0dcf2246c11eaf6c4f2591332f1057734a847793', + 'dart_clock_rev': '80e70acf72cc3a876d3158911b097b581cd8fd1a', + 'dart_collection_rev': '471839875a3bbfb26a7d51eca82be5b788660982', + 'dart_devtools_rev': '73489f91e37c8f51161b3c63ffced83318e14424', 'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb', 'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b', 'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10', 'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e', 'dart_pub_rev': '55cc6c138ad4777cf4fc0710c55dc37a33fdcd69', - 'dart_tools_rev': '3e21ae9cea75987365249f2c067eabd16fbaf2d7', - 'dart_watcher_rev': '1bd2f20d0d924c8422aa2b9afdb165bff4f053c0', - 'dart_web_rev': '9d8c802d13b785b1a5b201c4a43605d640841c98', - 'dart_webdev_rev': '50bf268794a4cb70b3a82d8177e55160ee4227df', - 'dart_webkit_inspection_protocol_rev': '153fea4fe5ac45bebf0c2e76bb3d76b0f1fcdaae', - 'dart_yaml_edit_rev': 'f5a92b3bc64b4e78ec1fb616ad1dff2174e799b1', + 'dart_tools_rev': 'd35d633e6df04f8a60a305a36437f67f9fefca5d', + 'dart_watcher_rev': '42308ea9e22bc2d1edab497ee58c0df0affbfed0', + 'dart_web_rev': 'ff7185c6c0360987116115039a08d9134c8d62aa', + 'dart_webdev_rev': 'c233e453d3172536d2e04575d752c1a7c0acae57', + 'dart_webkit_inspection_protocol_rev': '5740cc91eaeb13a02007b77b128fccf4b056db6e', + 'dart_yaml_edit_rev': 'c4629ad7eec13ddf449918ab8a796e0403330e3f', 'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1 @@ -344,28 +344,28 @@ deps = { # WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py. 'src/flutter/third_party/dart/third_party/binaryen/src': - Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@9784f012848a7eb321c2037bdb363dfe0eab8bc9', + Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@4b7c610f14329dfe045534ec1cde7f28330393f9', 'src/flutter/third_party/dart/third_party/devtools': - {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:486dae7785dc0bda5cc0c463ab704e469bb03f1a'}]}, + {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:73489f91e37c8f51161b3c63ffced83318e14424'}]}, 'src/flutter/third_party/dart/third_party/pkg/args': Var('dart_git') + '/args.git@5c83bc9785d6c32ffe6824ba79fadcc51fbcd1c1', 'src/flutter/third_party/dart/third_party/pkg/async': - Var('dart_git') + '/async.git@47968047eb9888f74ca0691640821bd55b47e763', + Var('dart_git') + '/async.git@09cba7fb16aa66886951872a68bbd49ad8d09cf8', 'src/flutter/third_party/dart/third_party/pkg/bazel_worker': - Var('dart_git') + '/bazel_worker.git@79d2ad13c83d5e0883136503d86ddf60fe665900', + Var('dart_git') + '/bazel_worker.git@2fb4fbff6ee8d26fee1f3576fa0500057d897afd', 'src/flutter/third_party/dart/third_party/pkg/boolean_selector': - Var('dart_git') + '/boolean_selector.git@24635df68661bb44c1c13fb405562421e24298e5', + Var('dart_git') + '/boolean_selector.git@2cbd4a60b89fe51a404e9ee3625a8fb8019561dd', 'src/flutter/third_party/dart/third_party/pkg/browser_launcher': Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'), 'src/flutter/third_party/dart/third_party/pkg/cli_util': - Var('dart_git') + '/cli_util.git@e222c560d88d127bc5e991ca96be2b1e875f4f3e', + Var('dart_git') + '/cli_util.git@9fe3eeb8a2fad6da9a156055207337474436da12', 'src/flutter/third_party/dart/third_party/pkg/clock': Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'), @@ -374,61 +374,61 @@ deps = { Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'), 'src/flutter/third_party/dart/third_party/pkg/convert': - Var('dart_git') + '/convert.git@186ac2281f0436451b49e1bd8458ff791b42637d', + Var('dart_git') + '/convert.git@056626e0cddd56c4cc1184aac787ba06ecdaae3a', 'src/flutter/third_party/dart/third_party/pkg/crypto': - Var('dart_git') + '/crypto.git@1c7fbadd92a44322ee1e89eec9747a24dc6c6746', + Var('dart_git') + '/crypto.git@3f815aca8ad5020bb39be09ec9bfd75c36910809', 'src/flutter/third_party/dart/third_party/pkg/csslib': - Var('dart_git') + '/csslib.git@171ed4885f1db13e22b04b513a169e7a99d2c5d5', + Var('dart_git') + '/csslib.git@141dd6567651500bb8c17ccb65e3c9e117c64035', '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@d9e31ff950c92350b464b859eaac272a97e15070', + Var('dart_git') + '/dartdoc.git@6e9c1eae7ef0a1521e865dafbacc2c8a1d2fd9dd', 'src/flutter/third_party/dart/third_party/pkg/file': - Var('dart_git') + '/external/github.com/google/file.dart@f858c6fe9d1b0167b944aa62dd9b4321036b5238', + Var('dart_git') + '/external/github.com/google/file.dart@8ce0d13ffe9dac267bdbd6c65c145ba4f611af72', 'src/flutter/third_party/dart/third_party/pkg/fixnum': - Var('dart_git') + '/fixnum.git@dec16eb715f70f2fe0ed509da2e118354bea21d8', + Var('dart_git') + '/fixnum.git@2c9f25d5057ce4b450ea193a8501e9f79a1b1dc8', 'src/flutter/third_party/dart/third_party/pkg/glob': - Var('dart_git') + '/glob.git@25ee2c20a3c7b93f4096036939a59e40916a3890', + Var('dart_git') + '/glob.git@44e8c22f9271a62b03d2551d1e7b7ac18d589f16', 'src/flutter/third_party/dart/third_party/pkg/html': - Var('dart_git') + '/html.git@5b99b43f71da0c6b0f962244c7f5dfa8ca970fef', + Var('dart_git') + '/html.git@44613e897fc80f2fcd43a355c98506df12fd38e2', 'src/flutter/third_party/dart/third_party/pkg/http': - Var('dart_git') + '/http.git@e459e5c6f6c60d56a42755164526501f3daa66df', + Var('dart_git') + '/http.git@dd31e64685b03a9700cc99d7b7fc637dd60c4d3a', 'src/flutter/third_party/dart/third_party/pkg/http_multi_server': - Var('dart_git') + '/http_multi_server.git@6ce0a137aa20cc12b883a386bb7c0ae677cb3429', + Var('dart_git') + '/http_multi_server.git@e45a674bf4d2552438e3632cdc40f303f4b01e74', 'src/flutter/third_party/dart/third_party/pkg/http_parser': - Var('dart_git') + '/http_parser.git@8ffcaec6fedfac5274cfa57e133d47d499bdabc0', + Var('dart_git') + '/http_parser.git@ad0581078d45bfa3b2ded5b7d9a5f7797c8d109d', 'src/flutter/third_party/dart/third_party/pkg/intl': Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f', 'src/flutter/third_party/dart/third_party/pkg/json_rpc_2': - Var('dart_git') + '/json_rpc_2.git@1a4c47339a741c7554996e467cf2b8bf515ca5b9', + Var('dart_git') + '/json_rpc_2.git@7547bb16a90dbd436d50dad93f2e7a9dc0956423', 'src/flutter/third_party/dart/third_party/pkg/leak_tracker': Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c', 'src/flutter/third_party/dart/third_party/pkg/logging': - Var('dart_git') + '/logging.git@dcaf2498e5ce34b17b48770b4e78c44fc9e63cd3', + Var('dart_git') + '/logging.git@49d89b1de6e847174bc93b709e858b99e61b2ae7', 'src/flutter/third_party/dart/third_party/pkg/markdown': - Var('dart_git') + '/markdown.git@782b1803a29aa964410d93b4437d5d1efa47f6b4', + Var('dart_git') + '/markdown.git@6aaa152f30255cc660d387b6e4e34543afbb277c', 'src/flutter/third_party/dart/third_party/pkg/matcher': - Var('dart_git') + '/matcher.git@54c2798d9b75c6db5cdcc7acbf5b9ae215316ed5', + Var('dart_git') + '/matcher.git@b42bf10b0da3e5b748bbc51bdc1dfaeacf824563', 'src/flutter/third_party/dart/third_party/pkg/mime': - Var('dart_git') + '/mime.git@0a32241c4fcd077a945949760b287677e4d7aff4', + Var('dart_git') + '/mime.git@b01c9a24e0991da479bd405138be3b3e403ff456', 'src/flutter/third_party/dart/third_party/pkg/mockito': Var('dart_git') + '/mockito.git@81ecb88b631a9c1e677852a33ad916238dee0ef2', @@ -437,13 +437,13 @@ deps = { Var('dart_git') + '/native.git@71ada4b5c8001e6b8207ed40331d158e0912cd94', 'src/flutter/third_party/dart/third_party/pkg/package_config': - Var('dart_git') + '/package_config.git@854dc194131af8e2c16ef46ad210af9b2ef45fa9', + Var('dart_git') + '/package_config.git@a36e496d61937a800c22f68035dc98bf8ead7fb2', 'src/flutter/third_party/dart/third_party/pkg/path': - Var('dart_git') + '/path.git@a7284b9917830c18618b26d396d0f0bffc92bb01', + Var('dart_git') + '/path.git@f411b96a2598d3911b485d606430fd775fd9e41a', 'src/flutter/third_party/dart/third_party/pkg/pool': - Var('dart_git') + '/pool.git@8055cbb290590e761e1149dfbf7c2283fdd88e4f', + Var('dart_git') + '/pool.git@e6df05a287a2193c4c566608f9cd12e8689d3264', 'src/flutter/third_party/dart/third_party/pkg/protobuf': Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'), @@ -452,52 +452,52 @@ 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@7581029bf5346fd5a44b95f4686bba8de7598859', + Var('dart_git') + '/pub_semver.git@df834e180f86b6dac8ef0222a28987009ad75a75', 'src/flutter/third_party/dart/third_party/pkg/shelf': - Var('dart_git') + '/shelf.git@7352d1b7ac283df8eac36441d7569be8a36757f9', + Var('dart_git') + '/shelf.git@c8d8058e426bd6a874dd4ded29cd88216e248387', 'src/flutter/third_party/dart/third_party/pkg/source_map_stack_trace': - Var('dart_git') + '/source_map_stack_trace.git@9ed8875f0933bf0d8e09694211cb9765147b27bb', + Var('dart_git') + '/source_map_stack_trace.git@4671c20004a89a3eabd150f2fc65bcf4319bba49', 'src/flutter/third_party/dart/third_party/pkg/source_maps': - Var('dart_git') + '/source_maps.git@aedfc39235941a31070fe53149b5776ea29be44f', + Var('dart_git') + '/source_maps.git@c4dc7d082608405049f0cc0bc23ca693e4532815', 'src/flutter/third_party/dart/third_party/pkg/source_span': - Var('dart_git') + '/source_span.git@45e11a3a0e4b14116911fffc21e2cdc95824e28f', + Var('dart_git') + '/source_span.git@1695904bca53ae6d3d51f05d25ce6568b376aecd', 'src/flutter/third_party/dart/third_party/pkg/sse': - Var('dart_git') + '/sse.git@1ab266ad570134294468225d1c2ffe86338005be', + Var('dart_git') + '/sse.git@f5ed4d6339794db5ec98969f3f60d0ce8c44dd60', 'src/flutter/third_party/dart/third_party/pkg/stack_trace': - Var('dart_git') + '/stack_trace.git@c39ae6e955a76a2ff183288f051f4eee7a5e94d1', + Var('dart_git') + '/stack_trace.git@54c7b9da965bbdc4b49038ce0ab8ecdd0449e5fe', 'src/flutter/third_party/dart/third_party/pkg/stream_channel': - Var('dart_git') + '/stream_channel.git@5f72035464ea675c75982b80db967943a0cfddcb', + Var('dart_git') + '/stream_channel.git@ba351378fbddffd736e2faf6a412568f9aba0536', 'src/flutter/third_party/dart/third_party/pkg/string_scanner': - Var('dart_git') + '/string_scanner.git@8dbfddf9a7e8cdd4978ddd3cdab188cfabc543fd', + Var('dart_git') + '/string_scanner.git@6e893afd9a8f0ff746156acc103a2dd1646a85fb', 'src/flutter/third_party/dart/third_party/pkg/tar': Var('dart_git') + '/external/github.com/simolus3/tar.git@6150a0c88d9bd17e3e961593a9a7a9564866e8b4', 'src/flutter/third_party/dart/third_party/pkg/term_glyph': - Var('dart_git') + '/term_glyph.git@2ad48ce95b6e6d001251d55b15719ee113caf802', + Var('dart_git') + '/term_glyph.git@c3e323bcfe3f992c2b3059e141eb5ccbc1ba39c4', 'src/flutter/third_party/dart/third_party/pkg/test': - Var('dart_git') + '/test.git@c7a76b08c11afb27fdb61d65b5fc757e4274928c', + Var('dart_git') + '/test.git@0562baf0994ee76fcdcc55bf1d70e00ddeed44f3', 'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader': - Var('dart_git') + '/test_reflective_loader.git@d7167a2375d8a0c02c12b960c059a115a777f238', + Var('dart_git') + '/test_reflective_loader.git@537ab5b24632c03918fb229531cfb41946eeae27', 'src/flutter/third_party/dart/third_party/pkg/tools': 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@8c7393cbbbba7a5d38c6772371f92d6b38e433fc', + Var('dart_git') + '/typed_data.git@5b3708eb633593b30868871301e8e15d344d7585', 'src/flutter/third_party/dart/third_party/pkg/usage': - Var('dart_git') + '/usage.git@2847cdb94e238a921c600e81b52c91baf4ea0b50', + Var('dart_git') + '/usage.git@bc4907bca87e2ef5e9ee80e1bef7ee57f5cbc6d2', 'src/flutter/third_party/dart/third_party/pkg/watcher': Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'), @@ -506,7 +506,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@b67222092b4153cd7d61b92744b4f0a620c55481', + Var('dart_git') + '/web_socket_channel.git@d86313dfb30fbc4c15c53424c3d637559ad978e1', 'src/flutter/third_party/dart/third_party/pkg/webdev': Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'), @@ -515,7 +515,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@5a1c4be2437bc4122ccf08a3a0f06a7683e62f30', + Var('dart_git') + '/yaml.git@022ea6456d27ce6cc38f4d44833ba8865ac43b9f', 'src/flutter/third_party/dart/third_party/pkg/yaml_edit': Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'), diff --git a/engine/src/flutter/ci/licenses_golden/licenses_dart b/engine/src/flutter/ci/licenses_golden/licenses_dart index 56ada58ec70..a87cd5e39ac 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_dart +++ b/engine/src/flutter/ci/licenses_golden/licenses_dart @@ -1,4 +1,4 @@ -Signature: b2a3037048bb465b665a641ba709d39f +Signature: bc915b1167a126718a286c70d54e2f3a ==================================================================================================== LIBRARY: dart @@ -4741,7 +4741,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/+/a9cf6a411c717916c4a170fcf7f6836a93a8ea04 +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/b7cad2edae4bcbe05332c9956a04692d19798904 /third_party/fallback_root_certificates/ ==================================================================================================== diff --git a/engine/src/flutter/sky/packages/sky_engine/LICENSE b/engine/src/flutter/sky/packages/sky_engine/LICENSE index 456fcc59b71..f47a1663565 100644 --- a/engine/src/flutter/sky/packages/sky_engine/LICENSE +++ b/engine/src/flutter/sky/packages/sky_engine/LICENSE @@ -32293,7 +32293,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/+/a9cf6a411c717916c4a170fcf7f6836a93a8ea04 +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/b7cad2edae4bcbe05332c9956a04692d19798904 /third_party/fallback_root_certificates/ --------------------------------------------------------------------------------