From 8ade21691db64b17b295f1691585f25d61a91402 Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Mon, 5 Jun 2023 08:33:21 -0700 Subject: [PATCH 1/2] Revert "Manual roll Dart SDK from 9d8df2a5210b to d198f84f5e4e (1 revision) (#42527)" This reverts commit 8f7dc775a27890ae310c949ea5bb11e42f1b26e0. --- DEPS | 28 ++++++++++---------- ci/licenses_golden/licenses_third_party | 2 +- sky/packages/sky_engine/LICENSE | 34 ------------------------- 3 files changed, 15 insertions(+), 49 deletions(-) diff --git a/DEPS b/DEPS index c5933a00dd24e..9ab637725e612 100644 --- a/DEPS +++ b/DEPS @@ -53,7 +53,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': 'd198f84f5e4e7740e373bd7ba2f6d9b60298684f', + 'dart_revision': '9d8df2a5210b8888b1ef86eeb4235cebfcb4b578', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -67,11 +67,11 @@ vars = { 'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb', 'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5', 'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10', - 'dart_protobuf_rev': 'da6953c65a93f02908f79d7d8402af843a60dcff', + 'dart_protobuf_rev': '346a72dd04602f004a5b2c06ee4196b6112492b7', 'dart_pub_rev': '078c7fea0be2656debc675646806da14fa94f853', 'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50', 'dart_watcher_rev': '3f17faa2d09dca3e23bc07a01f2045ec0cd2837d', - 'dart_webdev_rev': 'f565d7f1f8ac6e38613beb3be3b370d3dae23d4b', + 'dart_webdev_rev': 'd442fa89bfe8a81ec0679f2d927765e182f7baf9', 'dart_webkit_inspection_protocol_rev': '39a3c297ff573635e7936b015ce4f3466e4739d6', 'dart_yaml_edit_rev': '87dcf31fcaada207ae7c3527f9885982534badce', 'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f', @@ -334,13 +334,13 @@ deps = { {'packages': [{'version': 'git_revision:0c0c65dbaf53f8c508bfd6acbeb7f1986c1ca1f8', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'}, 'src/third_party/dart/third_party/pkg/args': - Var('dart_git') + '/args.git@a9543c021f9409832b1668f9256f247585362389', + Var('dart_git') + '/args.git@f0f6cd22d29f15f86b3d2caab053bae029d30c9a', 'src/third_party/dart/third_party/pkg/async': Var('dart_git') + '/async.git@96c29d0af81436443a3a24683915d39202172cde', 'src/third_party/dart/third_party/pkg/bazel_worker': - Var('dart_git') + '/bazel_worker.git@c14a2687728081adc14c12fa50165e785326275c', + Var('dart_git') + '/bazel_worker.git@d9b389f30848253d3310f931a9b8d39ca07102b1', 'src/third_party/dart/third_party/pkg/boolean_selector': Var('dart_git') + '/boolean_selector.git@3a1c982002f580b835b4380f44d9f8e5bc37fc4f', @@ -370,7 +370,7 @@ deps = { Var('dart_git') + '/dart_style.git@2956b1a705953f880a5dae9d3a0969df0fc45e99', 'src/third_party/dart/third_party/pkg/dartdoc': - Var('dart_git') + '/dartdoc.git@39fe1a8acdfa01d3671223dbbb4e98d360bd1083', + Var('dart_git') + '/dartdoc.git@950898f5ffea617bc572687c15cf51b2d6f05dad', 'src/third_party/dart/third_party/pkg/ffi': Var('dart_git') + '/ffi.git@7f4acbd7532d94a793452030ff96bfef8cd96b68', @@ -388,7 +388,7 @@ deps = { Var('dart_git') + '/html.git@92eacabadf40aa24c8f4289682ef2822c5d7e414', 'src/third_party/dart/third_party/pkg/http': - Var('dart_git') + '/http.git@8834aecd973446263a23e1d2ea17932721c87281', + Var('dart_git') + '/http.git@18a43a2b3cc1af2f1e3a90aa848b7645bc400e0f', 'src/third_party/dart/third_party/pkg/http_multi_server': Var('dart_git') + '/http_multi_server.git@a209cd59d99b52ff08b32ba37bdc9fc1a79bc9f2', @@ -403,7 +403,7 @@ deps = { Var('dart_git') + '/json_rpc_2.git@73467f3651669af4870260fea4e99d7ba6ccb7ec', 'src/third_party/dart/third_party/pkg/leak_tracker': - Var('dart_git') + '/leak_tracker.git@cbbdecae245c954686f871f04353f66b703c3332', + Var('dart_git') + '/leak_tracker.git@7f2cab3e0ce296f29ce0e45c5967707b95268eef', 'src/third_party/dart/third_party/pkg/linter': Var('dart_git') + '/linter.git@27b46ce246204a2c0170a4bd5b23b94095e89a22', @@ -421,10 +421,10 @@ deps = { Var('dart_git') + '/mime.git@24448401f621b9e154d165c900a3c8decd8a23f4', 'src/third_party/dart/third_party/pkg/mockito': - Var('dart_git') + '/mockito.git@924f65cfe3510384fb780c5bd082c49cdb9dd6f2', + Var('dart_git') + '/mockito.git@40fe2ca00a10ae0fb73efb848920383be996d753', 'src/third_party/dart/third_party/pkg/native': - Var('dart_git') + '/native.git@c851e69448594b1942e62e0d9f92e47d99575b99', + Var('dart_git') + '/native.git@76bc55e6c978d1793471ccfd7b0c883b3ba01dca', 'src/third_party/dart/third_party/pkg/package_config': Var('dart_git') + '/package_config.git@203de2022af26b3ab2bcec18cc49614d9e502897', @@ -442,10 +442,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@3930557ee0b20ef528713952c318139409edadb4', + Var('dart_git') + '/pub_semver.git@c03435229a57d7b158df9feafdb5a2ccaef28d39', 'src/third_party/dart/third_party/pkg/shelf': - Var('dart_git') + '/shelf.git@ce379aa3c22024edb2df3657fd564f1f463406e6', + Var('dart_git') + '/shelf.git@a404b6a3f3a3bde1a5f62b051b8852652ed677da', 'src/third_party/dart/third_party/pkg/source_map_stack_trace': Var('dart_git') + '/source_map_stack_trace.git@b83af01938225c1706bbc6c1f86bd4a394f91380', @@ -460,7 +460,7 @@ deps = { Var('dart_git') + '/sse.git@bfcbcd7a7320c74dfee154152419381c508a1fad', 'src/third_party/dart/third_party/pkg/stack_trace': - Var('dart_git') + '/stack_trace.git@8b2046ecac56f5bb9196033ed187da0cf73eac67', + Var('dart_git') + '/stack_trace.git@86f7e30912d3cac447a751dc0bf2bafd473492dd', 'src/third_party/dart/third_party/pkg/stream_channel': Var('dart_git') + '/stream_channel.git@b1d3384638064a4f25beacef3be770e2c4534408', @@ -478,7 +478,7 @@ deps = { Var('dart_git') + '/test_reflective_loader.git@40d61b16647cd61b02d806fea46362ef07e7c502', 'src/third_party/dart/third_party/pkg/tools': - Var('dart_git') + '/tools.git@389925fcfe79edd682e7547ce6f8d05bd0d786a8', + Var('dart_git') + '/tools.git@d723a55062959713f715ca3f10190a72c79634ef', 'src/third_party/dart/third_party/pkg/typed_data': Var('dart_git') + '/typed_data.git@693f48e3d1d528f6f26d7069a2ad29b460650455', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 99bbdf2c444f0..5d29d208ed6bc 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: c923f67209a67a3ceb59c7e13f38b2d2 +Signature: 5fce067e90cfe2c74b5c556030912ef7 ==================================================================================================== LIBRARY: angle diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index f5581dcdb4ecc..29f047cedc9db 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -28078,40 +28078,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- -angle - -Copyright 2023 The ANGLE Project Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc. - Ltd., nor the names of their contributors may be used to endorse - or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------------------- skia Copyright 2023 The Android Open Source Project From 2662dad49670d921c68a4295dac71b1ecb2c9bcb Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Mon, 5 Jun 2023 08:34:31 -0700 Subject: [PATCH 2/2] Revert "Roll Dart SDK from 3d4d29d8f16b to 9d8df2a5210b (2 revisions) (#42509)" This reverts commit 01209d9482edcbb0e4c23e29e2d7677515cf16eb. --- DEPS | 2 +- ci/licenses_golden/licenses_third_party | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 9ab637725e612..8c8d3cb623ff4 100644 --- a/DEPS +++ b/DEPS @@ -53,7 +53,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': '9d8df2a5210b8888b1ef86eeb4235cebfcb4b578', + 'dart_revision': '3d4d29d8f16b7d81c03b701f29039fb216d15a56', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 5d29d208ed6bc..ba4cc0fd0e821 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,5 @@ -Signature: 5fce067e90cfe2c74b5c556030912ef7 +Signature: fb9c41989bbf2d81046c5b4fbdb807ed + ==================================================================================================== LIBRARY: angle