Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit bfcf877

Browse files
authored
Revert Dart SDK to 3.1.0-163.0.dev for branch alignment (#42569)
3.1.0-163.0.dev is the most recent version in g3 that has successfully rolled to the framework. This PR rolls the engine back to this last known good version of Dart.
1 parent 622751b commit bfcf877

File tree

3 files changed

+16
-49
lines changed

3 files changed

+16
-49
lines changed

DEPS

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ vars = {
5353
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5454
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5555
# updated revision list of existing dependencies.
56-
'dart_revision': 'd198f84f5e4e7740e373bd7ba2f6d9b60298684f',
56+
'dart_revision': '3d4d29d8f16b7d81c03b701f29039fb216d15a56',
5757

5858
# WARNING: DO NOT EDIT MANUALLY
5959
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -67,11 +67,11 @@ vars = {
6767
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
6868
'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
6969
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
70-
'dart_protobuf_rev': 'da6953c65a93f02908f79d7d8402af843a60dcff',
70+
'dart_protobuf_rev': '346a72dd04602f004a5b2c06ee4196b6112492b7',
7171
'dart_pub_rev': '078c7fea0be2656debc675646806da14fa94f853',
7272
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
7373
'dart_watcher_rev': '3f17faa2d09dca3e23bc07a01f2045ec0cd2837d',
74-
'dart_webdev_rev': 'f565d7f1f8ac6e38613beb3be3b370d3dae23d4b',
74+
'dart_webdev_rev': 'd442fa89bfe8a81ec0679f2d927765e182f7baf9',
7575
'dart_webkit_inspection_protocol_rev': '39a3c297ff573635e7936b015ce4f3466e4739d6',
7676
'dart_yaml_edit_rev': '87dcf31fcaada207ae7c3527f9885982534badce',
7777
'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
@@ -334,13 +334,13 @@ deps = {
334334
{'packages': [{'version': 'git_revision:0c0c65dbaf53f8c508bfd6acbeb7f1986c1ca1f8', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
335335

336336
'src/third_party/dart/third_party/pkg/args':
337-
Var('dart_git') + '/args.git@a9543c021f9409832b1668f9256f247585362389',
337+
Var('dart_git') + '/args.git@f0f6cd22d29f15f86b3d2caab053bae029d30c9a',
338338

339339
'src/third_party/dart/third_party/pkg/async':
340340
Var('dart_git') + '/async.git@96c29d0af81436443a3a24683915d39202172cde',
341341

342342
'src/third_party/dart/third_party/pkg/bazel_worker':
343-
Var('dart_git') + '/bazel_worker.git@c14a2687728081adc14c12fa50165e785326275c',
343+
Var('dart_git') + '/bazel_worker.git@d9b389f30848253d3310f931a9b8d39ca07102b1',
344344

345345
'src/third_party/dart/third_party/pkg/boolean_selector':
346346
Var('dart_git') + '/boolean_selector.git@3a1c982002f580b835b4380f44d9f8e5bc37fc4f',
@@ -370,7 +370,7 @@ deps = {
370370
Var('dart_git') + '/dart_style.git@2956b1a705953f880a5dae9d3a0969df0fc45e99',
371371

372372
'src/third_party/dart/third_party/pkg/dartdoc':
373-
Var('dart_git') + '/dartdoc.git@39fe1a8acdfa01d3671223dbbb4e98d360bd1083',
373+
Var('dart_git') + '/dartdoc.git@950898f5ffea617bc572687c15cf51b2d6f05dad',
374374

375375
'src/third_party/dart/third_party/pkg/ffi':
376376
Var('dart_git') + '/ffi.git@7f4acbd7532d94a793452030ff96bfef8cd96b68',
@@ -388,7 +388,7 @@ deps = {
388388
Var('dart_git') + '/html.git@92eacabadf40aa24c8f4289682ef2822c5d7e414',
389389

390390
'src/third_party/dart/third_party/pkg/http':
391-
Var('dart_git') + '/http.git@8834aecd973446263a23e1d2ea17932721c87281',
391+
Var('dart_git') + '/http.git@18a43a2b3cc1af2f1e3a90aa848b7645bc400e0f',
392392

393393
'src/third_party/dart/third_party/pkg/http_multi_server':
394394
Var('dart_git') + '/http_multi_server.git@a209cd59d99b52ff08b32ba37bdc9fc1a79bc9f2',
@@ -403,7 +403,7 @@ deps = {
403403
Var('dart_git') + '/json_rpc_2.git@73467f3651669af4870260fea4e99d7ba6ccb7ec',
404404

405405
'src/third_party/dart/third_party/pkg/leak_tracker':
406-
Var('dart_git') + '/leak_tracker.git@cbbdecae245c954686f871f04353f66b703c3332',
406+
Var('dart_git') + '/leak_tracker.git@7f2cab3e0ce296f29ce0e45c5967707b95268eef',
407407

408408
'src/third_party/dart/third_party/pkg/linter':
409409
Var('dart_git') + '/linter.git@27b46ce246204a2c0170a4bd5b23b94095e89a22',
@@ -421,10 +421,10 @@ deps = {
421421
Var('dart_git') + '/mime.git@24448401f621b9e154d165c900a3c8decd8a23f4',
422422

423423
'src/third_party/dart/third_party/pkg/mockito':
424-
Var('dart_git') + '/mockito.git@924f65cfe3510384fb780c5bd082c49cdb9dd6f2',
424+
Var('dart_git') + '/mockito.git@40fe2ca00a10ae0fb73efb848920383be996d753',
425425

426426
'src/third_party/dart/third_party/pkg/native':
427-
Var('dart_git') + '/native.git@c851e69448594b1942e62e0d9f92e47d99575b99',
427+
Var('dart_git') + '/native.git@76bc55e6c978d1793471ccfd7b0c883b3ba01dca',
428428

429429
'src/third_party/dart/third_party/pkg/package_config':
430430
Var('dart_git') + '/package_config.git@203de2022af26b3ab2bcec18cc49614d9e502897',
@@ -442,10 +442,10 @@ deps = {
442442
Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
443443

444444
'src/third_party/dart/third_party/pkg/pub_semver':
445-
Var('dart_git') + '/pub_semver.git@3930557ee0b20ef528713952c318139409edadb4',
445+
Var('dart_git') + '/pub_semver.git@c03435229a57d7b158df9feafdb5a2ccaef28d39',
446446

447447
'src/third_party/dart/third_party/pkg/shelf':
448-
Var('dart_git') + '/shelf.git@ce379aa3c22024edb2df3657fd564f1f463406e6',
448+
Var('dart_git') + '/shelf.git@a404b6a3f3a3bde1a5f62b051b8852652ed677da',
449449

450450
'src/third_party/dart/third_party/pkg/source_map_stack_trace':
451451
Var('dart_git') + '/source_map_stack_trace.git@b83af01938225c1706bbc6c1f86bd4a394f91380',
@@ -460,7 +460,7 @@ deps = {
460460
Var('dart_git') + '/sse.git@bfcbcd7a7320c74dfee154152419381c508a1fad',
461461

462462
'src/third_party/dart/third_party/pkg/stack_trace':
463-
Var('dart_git') + '/stack_trace.git@8b2046ecac56f5bb9196033ed187da0cf73eac67',
463+
Var('dart_git') + '/stack_trace.git@86f7e30912d3cac447a751dc0bf2bafd473492dd',
464464

465465
'src/third_party/dart/third_party/pkg/stream_channel':
466466
Var('dart_git') + '/stream_channel.git@b1d3384638064a4f25beacef3be770e2c4534408',
@@ -478,7 +478,7 @@ deps = {
478478
Var('dart_git') + '/test_reflective_loader.git@40d61b16647cd61b02d806fea46362ef07e7c502',
479479

480480
'src/third_party/dart/third_party/pkg/tools':
481-
Var('dart_git') + '/tools.git@389925fcfe79edd682e7547ce6f8d05bd0d786a8',
481+
Var('dart_git') + '/tools.git@d723a55062959713f715ca3f10190a72c79634ef',
482482

483483
'src/third_party/dart/third_party/pkg/typed_data':
484484
Var('dart_git') + '/typed_data.git@693f48e3d1d528f6f26d7069a2ad29b460650455',

ci/licenses_golden/licenses_third_party

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Signature: c923f67209a67a3ceb59c7e13f38b2d2
1+
Signature: fb9c41989bbf2d81046c5b4fbdb807ed
2+
23

34
====================================================================================================
45
LIBRARY: angle

sky/packages/sky_engine/LICENSE

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28078,40 +28078,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2807828078
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2807928079
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2808028080
--------------------------------------------------------------------------------
28081-
angle
28082-
28083-
Copyright 2023 The ANGLE Project Authors. All rights reserved.
28084-
28085-
Redistribution and use in source and binary forms, with or without
28086-
modification, are permitted provided that the following conditions
28087-
are met:
28088-
28089-
Redistributions of source code must retain the above copyright
28090-
notice, this list of conditions and the following disclaimer.
28091-
28092-
Redistributions in binary form must reproduce the above
28093-
copyright notice, this list of conditions and the following
28094-
disclaimer in the documentation and/or other materials provided
28095-
with the distribution.
28096-
28097-
Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc.
28098-
Ltd., nor the names of their contributors may be used to endorse
28099-
or promote products derived from this software without specific
28100-
prior written permission.
28101-
28102-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
28103-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
28104-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
28105-
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
28106-
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
28107-
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
28108-
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28109-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
28110-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28111-
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
28112-
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28113-
POSSIBILITY OF SUCH DAMAGE.
28114-
--------------------------------------------------------------------------------
2811528081
skia
2811628082

2811728083
Copyright 2023 The Android Open Source Project

0 commit comments

Comments
 (0)