From c689330bfc1e3fce71ad37db06efbfd1ef005165 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll Date: Thu, 4 Jan 2024 11:23:19 -0500 Subject: [PATCH] Manual roll Dart SDK from 7e9f7eab80d3 to 7f2523c2fa9a (3 revisions) (flutter/engine#49534) Manual roll requested by zra@google.com https://dart.googlesource.com/sdk.git/+log/7e9f7eab80d3..7f2523c2fa9a 2024-01-04 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.3.0-279.0.dev 2024-01-03 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.3.0-278.0.dev 2024-01-03 dart-internal-merge@dart-ci-internal.iam.gserviceaccount.com Version 3.3.0-277.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 | 40 +++++++++---------- .../flutter/ci/licenses_golden/licenses_dart | 4 +- .../flutter/sky/packages/sky_engine/LICENSE | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/DEPS b/DEPS index a6d3827e84b..48516c0064b 100644 --- a/DEPS +++ b/DEPS @@ -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': '7e9f7eab80d34a6c455793c5c9177464a0c0743b', + 'dart_revision': '7f2523c2fa9a74ef3cbe21ae885458fc1fb99d1b', # 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,17 +76,17 @@ vars = { 'dart_browser_launcher_rev': 'c68ec25e36187b050ac918d2b614f2d6320f0045', 'dart_clock_rev': 'f975668839f45bad561d6227f88297bbbcff03fa', 'dart_collection_rev': '2d57a82ad079fe2d127f5a9b188170de2f5cdedc', - 'dart_devtools_rev': '071405a237dab931ea10be728ec188aa2d55111f', + 'dart_devtools_rev': '226af81369622cce9c0d98adbe31598208a27cc0', 'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb', 'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b', 'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10', 'dart_protobuf_rev': '20ec6856b65b7fd6445219fdec24d90b414f7469', 'dart_pub_rev': '1779628b386819675130f14326f1e8812901c48f', - 'dart_tools_rev': 'ed81684df747830de8b29e9d6e6d8f951ea6968d', - 'dart_watcher_rev': 'dc45f1925f66743ff29b9dcbb4693a7ec25945c5', - 'dart_webdev_rev': '8375cd66821550cb7a129315d97cd768c5fdd92c', + 'dart_tools_rev': '2f59ab443ab829dfbd2922d0edac44cda27889ae', + 'dart_watcher_rev': '66cd694ffb7ee6e09ff0cde6c9f788aa47ee1a23', + 'dart_webdev_rev': 'b2405cba63064e655f1276a319ada842a8fb53bf', 'dart_webkit_inspection_protocol_rev': '667c55e6f65638592768e0325b75420e39b01d2e', - 'dart_yaml_edit_rev': '9b9d33c5255798c950e843efe19e6f81a225ad28', + 'dart_yaml_edit_rev': '47eb20e9083954b7b9ec1fb04e7a9f8976a8ed14', 'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f', 'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1 @@ -333,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:071405a237dab931ea10be728ec188aa2d55111f'}]}, + {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:226af81369622cce9c0d98adbe31598208a27cc0'}]}, 'src/third_party/dart/third_party/pkg/args': Var('dart_git') + '/args.git@46d5033377d277d70bc6ec68504730b9384b1db1', @@ -351,7 +351,7 @@ deps = { Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'), 'src/third_party/dart/third_party/pkg/cli_util': - Var('dart_git') + '/cli_util.git@500dffab6e00332c4c0b814359f06c8a9c3a5573', + Var('dart_git') + '/cli_util.git@e5b38ac76887e6eefaf417f5222c317929eed278', 'src/third_party/dart/third_party/pkg/clock': Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'), @@ -360,13 +360,13 @@ deps = { Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'), 'src/third_party/dart/third_party/pkg/convert': - Var('dart_git') + '/convert.git@35031701fab532ada1a75c51155c0a6801055d88', + Var('dart_git') + '/convert.git@f8a72d67a10805bca358be8d7e189a62f79d86b9', 'src/third_party/dart/third_party/pkg/crypto': - Var('dart_git') + '/crypto.git@f3e64d234416466683e29a4b20cf751684cbae6a', + Var('dart_git') + '/crypto.git@f2efb981b461dcae43d0cf18a3a970142abfee35', 'src/third_party/dart/third_party/pkg/csslib': - Var('dart_git') + '/csslib.git@17346e528b19c09b2d20589e0ffa0f01a5ad54ad', + Var('dart_git') + '/csslib.git@1ad2d1ec461fb1836180e917220a5a48fd641897', 'src/third_party/dart/third_party/pkg/dart_style': Var('dart_git') + '/dart_style.git@8b1f24a8475a0116757172cd9acca4acbf87d973', @@ -402,13 +402,13 @@ deps = { Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f', 'src/third_party/dart/third_party/pkg/json_rpc_2': - Var('dart_git') + '/json_rpc_2.git@460545c62d12c2cd4635054e327846628288cb7e', + Var('dart_git') + '/json_rpc_2.git@ac1fabddd51fc90aa6fa4e1248f1a7141899eb4a', 'src/third_party/dart/third_party/pkg/leak_tracker': Var('dart_git') + '/leak_tracker.git@8644f8b1c78009e9149e08e0c349d06c304110a9', 'src/third_party/dart/third_party/pkg/logging': - Var('dart_git') + '/logging.git@324a0b5fd2b49b80ea4fbe2b48aac7794000e25a', + Var('dart_git') + '/logging.git@4d35a4e02b9237bd794378413e7ce3deb52ffcaf', 'src/third_party/dart/third_party/pkg/markdown': Var('dart_git') + '/markdown.git@d2e790305d136b4eb39d329c884bb49d5a5f1411', @@ -417,22 +417,22 @@ deps = { Var('dart_git') + '/matcher.git@fcbd3616c1dbe636d22d2b164aee3f1c32c52a42', 'src/third_party/dart/third_party/pkg/mime': - Var('dart_git') + '/mime.git@56359b0c72e1a9a2e2b20ee5a34bacc18e113897', + Var('dart_git') + '/mime.git@ca9f059d2334bb2657683e0a7f5949817cb4b0e6', 'src/third_party/dart/third_party/pkg/mockito': Var('dart_git') + '/mockito.git@57a7c820ffae61e3df0dbc279ad98b92751175f0', 'src/third_party/dart/third_party/pkg/native': - Var('dart_git') + '/native.git@b668ca94f551fcebdeb3ce9f822170facced55ae', + Var('dart_git') + '/native.git@0605d9ae6d2497737077539273992f8e1411286b', 'src/third_party/dart/third_party/pkg/package_config': Var('dart_git') + '/package_config.git@33dd24659147bd7ed2fa87aeacc52d199be766b4', 'src/third_party/dart/third_party/pkg/path': - Var('dart_git') + '/path.git@115ea2a4084881e7c76089a37abc01a067dfa6e3', + Var('dart_git') + '/path.git@57a049cff2e2be7a302dd9683b2b194c6d06e2d4', 'src/third_party/dart/third_party/pkg/pool': - Var('dart_git') + '/pool.git@3c1bd422da311d95b65a04a5f28de2c0e8193692', + Var('dart_git') + '/pool.git@4c490001446d8ba3d361b99d8befd6a4f61abc7a', 'src/third_party/dart/third_party/pkg/protobuf': Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'), @@ -444,7 +444,7 @@ deps = { Var('dart_git') + '/pub_semver.git@45721813dea1591a7689f93762afa358cbf260c7', 'src/third_party/dart/third_party/pkg/shelf': - Var('dart_git') + '/shelf.git@b3adc7c5264b448a77427c6aacd67eedfb16dce2', + Var('dart_git') + '/shelf.git@733588f90572801574f68d636338f61c12781cd1', 'src/third_party/dart/third_party/pkg/source_map_stack_trace': Var('dart_git') + '/source_map_stack_trace.git@220962658bf67304207aedc7eeedca6ef64a7c72', @@ -459,7 +459,7 @@ deps = { Var('dart_git') + '/sse.git@8d2e2f0d00a5b46f005c621a3b23465ce7348724', 'src/third_party/dart/third_party/pkg/stack_trace': - Var('dart_git') + '/stack_trace.git@4abff4489b93e6bbc82063343e666ccda9f62e8e', + Var('dart_git') + '/stack_trace.git@0f4710c9d2678530501e1e88c77f955b68450325', 'src/third_party/dart/third_party/pkg/stream_channel': Var('dart_git') + '/stream_channel.git@178104d0f1316b0120cf0031b8dbae0cbfec4c26', @@ -501,7 +501,7 @@ deps = { Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'), 'src/third_party/dart/third_party/pkg/yaml': - Var('dart_git') + '/yaml.git@98a3aab54b09d355e094fdb4e5abd9083a2876b8', + Var('dart_git') + '/yaml.git@509fd72c0910746bf25db9c7d890b4c47c286a8c', 'src/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 05ded9dc238..b15e1db5167 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_dart +++ b/engine/src/flutter/ci/licenses_golden/licenses_dart @@ -1,4 +1,4 @@ -Signature: deed7ad7eb484dd81cf977cb496faf3f +Signature: eee4f37ae6118294f161936829efecdf ==================================================================================================== LIBRARY: dart @@ -4707,7 +4707,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/+/54ae1942813919819cf12265ca7eaf86e65d5a7f +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/7f2523c2fa9a74ef3cbe21ae885458fc1fb99d1b /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 e75a2485dc4..f640f4ef63b 100644 --- a/engine/src/flutter/sky/packages/sky_engine/LICENSE +++ b/engine/src/flutter/sky/packages/sky_engine/LICENSE @@ -31177,7 +31177,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/+/7e9f7eab80d34a6c455793c5c9177464a0c0743b +You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/7f2523c2fa9a74ef3cbe21ae885458fc1fb99d1b /third_party/fallback_root_certificates/ --------------------------------------------------------------------------------