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

Commit 4a2ac0e

Browse files
bderobdero
authored
Revert 4 Dart rolls (726cb2467 -> ffc8bb004) to recover engine roll (#53778)
Tracking bug: flutter/flutter#151473 To resolve engine roll failures starting on roll: flutter/flutter#151434 Reverts 4 Dart rolls: - Roll Dart SDK from ffc8bb004a64 to 1679aba20a03 (16 revisions) (#53761) 9c40246 - Roll Dart SDK from 1679aba20a03 to 0ecada960645 (1 revision) (#53767) 14e0ac6 - Roll Dart SDK from 0ecada960645 to 33b65d2fe034 (2 revisions) (#53772) 3e17ca2 - Roll Dart SDK from 33b65d2fe034 to 726cb2467f27 (1 revision) (#53776) 84e2dc3
1 parent 84e2dc3 commit 4a2ac0e

File tree

3 files changed

+25
-31
lines changed

3 files changed

+25
-31
lines changed

‎DEPS‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': '726cb2467f27d49531551e6a03f14a3ce2f5e283',
59+
'dart_revision': 'ffc8bb004a64f6357e3d5d1185e974e966f00931',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -65,8 +65,8 @@ vars = {
6565
'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
6666
'dart_browser_launcher_rev': '60126904a26b761d29b4f2d76292ff3c089160de',
6767
'dart_clock_rev': 'ad428ea8b75fa0d7ba629791552d40478745c54a',
68-
'dart_collection_rev': '0c1f829c29da1d63488be774f430b2035a565d6f',
69-
'dart_devtools_rev': 'e77d6ce142b7bc737af3652f5727e449e84b7b03',
68+
'dart_collection_rev': '9354f386de3c57f5486b01ab4dfa1a2f033307d9',
69+
'dart_devtools_rev': '70375f6c6d81faa8f3069aa6dcf2a98c69445455',
7070
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
7171
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
7272
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
@@ -77,7 +77,7 @@ vars = {
7777
'dart_web_rev': 'e4c4d8126466e28dc137890b8f999da59bdedddd',
7878
'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
7979
'dart_webkit_inspection_protocol_rev': '32fffa53df3f54005c742ddf4f859fb585a6b254',
80-
'dart_yaml_edit_rev': 'd605cce3946828253a97f4b3de1a43260b6edf3b',
80+
'dart_yaml_edit_rev': '57a28daea82a3f00f57a90d5ea6df6a458b2f781',
8181

8282
'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
8383

@@ -347,16 +347,16 @@ deps = {
347347
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@654ee6e2504f11fb0e982a2cf276bafa750f694b',
348348

349349
'src/flutter/third_party/dart/third_party/devtools':
350-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:e77d6ce142b7bc737af3652f5727e449e84b7b03'}]},
350+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:70375f6c6d81faa8f3069aa6dcf2a98c69445455'}]},
351351

352352
'src/flutter/third_party/dart/third_party/pkg/args':
353-
Var('dart_git') + '/args.git@1a24d614423e7861ae2e341bfb19050959cef0cd',
353+
Var('dart_git') + '/args.git@6a5a2e6b1f0020b873c7ffbdd36a784c4f9ee300',
354354

355355
'src/flutter/third_party/dart/third_party/pkg/async':
356356
Var('dart_git') + '/async.git@c0d81f8699682d01d657a9bf827107d11904a247',
357357

358358
'src/flutter/third_party/dart/third_party/pkg/bazel_worker':
359-
Var('dart_git') + '/bazel_worker.git@02f190b88df771fc8e05c07d4b64ae942c02f456',
359+
Var('dart_git') + '/bazel_worker.git@c76d7c86381a6ed594641ba03b55c65b84ee11a6',
360360

361361
'src/flutter/third_party/dart/third_party/pkg/boolean_selector':
362362
Var('dart_git') + '/boolean_selector.git@c5468f44fd9ca0ea3435e1a0a84ff9b6fac38261',
@@ -386,40 +386,40 @@ deps = {
386386
Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
387387

388388
'src/flutter/third_party/dart/third_party/pkg/dartdoc':
389-
Var('dart_git') + '/dartdoc.git@5e8de164057dd5f7f34eee0ad443dc2f59c60c1c',
389+
Var('dart_git') + '/dartdoc.git@7e5da6090e6a48cebaee8789ca0fc396b34fd8a4',
390390

391391
'src/flutter/third_party/dart/third_party/pkg/file':
392-
Var('dart_git') + '/external/github.com/google/file.dart@855831c242a17c2dee163828d52710d9043c7c8d',
392+
Var('dart_git') + '/external/github.com/google/file.dart@07cacaed6679a173e29176747e6ce0325742749f',
393393

394394
'src/flutter/third_party/dart/third_party/pkg/fixnum':
395395
Var('dart_git') + '/fixnum.git@6c19e60366ce3d5edfaed51a7c12c98e7977977e',
396396

397397
'src/flutter/third_party/dart/third_party/pkg/glob':
398-
Var('dart_git') + '/glob.git@8b05be87f84f74d90dc0c15956f3ff95805322e5',
398+
Var('dart_git') + '/glob.git@6d3ba5ec02817e62d17ace040590bb81a3e1242f',
399399

400400
'src/flutter/third_party/dart/third_party/pkg/html':
401401
Var('dart_git') + '/html.git@0da420ca1e196cda54ede476d0d8d3ecf55375ef',
402402

403403
'src/flutter/third_party/dart/third_party/pkg/http':
404-
Var('dart_git') + '/http.git@4178b67e7970ff02926e79649db5ab473b46cf30',
404+
Var('dart_git') + '/http.git@8d893851904d8cd292a66e39812b59aca2cc4d96',
405405

406406
'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
407-
Var('dart_git') + '/http_multi_server.git@8348be1bf8fd17881e2643086e68c9d2b28dd9ce',
407+
Var('dart_git') + '/http_multi_server.git@25941e260658efb324de857e6022f418faf9bdd1',
408408

409409
'src/flutter/third_party/dart/third_party/pkg/http_parser':
410-
Var('dart_git') + '/http_parser.git@ce528cf82f3d26ac761e29b2494a9e0c270d4939',
410+
Var('dart_git') + '/http_parser.git@9bf7bd981a39137da1e5d7fe64f4652b078c7aa9',
411411

412412
'src/flutter/third_party/dart/third_party/pkg/intl':
413413
Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f',
414414

415415
'src/flutter/third_party/dart/third_party/pkg/json_rpc_2':
416-
Var('dart_git') + '/json_rpc_2.git@b4810dc7bee5828f240586c81f3f34853cacdbce',
416+
Var('dart_git') + '/json_rpc_2.git@616937f6d3837e38a2a287653ddaf722de260702',
417417

418418
'src/flutter/third_party/dart/third_party/pkg/leak_tracker':
419419
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
420420

421421
'src/flutter/third_party/dart/third_party/pkg/logging':
422-
Var('dart_git') + '/logging.git@8752902b75a476d2c7b64dcf01aaaee885f35c4c',
422+
Var('dart_git') + '/logging.git@6c3fb37fecb2e30415072f327b834a3e95517fa9',
423423

424424
'src/flutter/third_party/dart/third_party/pkg/markdown':
425425
Var('dart_git') + '/markdown.git@62424376d0b5fe35a2957b3caed4b75db010ba82',
@@ -431,13 +431,13 @@ deps = {
431431
Var('dart_git') + '/mime.git@11fec7d6df509a4efd554051cc27e3bf82df9c96',
432432

433433
'src/flutter/third_party/dart/third_party/pkg/mockito':
434-
Var('dart_git') + '/mockito.git@eb4d1daa20c105c94ac29689c1975f0850fa18f2',
434+
Var('dart_git') + '/mockito.git@a7fdf7101fbd31132a59188a6057d21004345927',
435435

436436
'src/flutter/third_party/dart/third_party/pkg/native':
437-
Var('dart_git') + '/native.git@cd8eddf8ad5b953127acf884f2b8a614482a8b0f',
437+
Var('dart_git') + '/native.git@fcc783c1d2777555616dfc850f131878ea5d88a9',
438438

439439
'src/flutter/third_party/dart/third_party/pkg/package_config':
440-
Var('dart_git') + '/package_config.git@f0b72567d85b827aa0f53991fe8a4a8bf36eb479',
440+
Var('dart_git') + '/package_config.git@903a0e528f91aef90821c8f5eaafbc1ae27198ab',
441441

442442
'src/flutter/third_party/dart/third_party/pkg/path':
443443
Var('dart_git') + '/path.git@e969f42ed112dd702a9453beb9df6c12ae2d3805',
@@ -461,10 +461,10 @@ deps = {
461461
Var('dart_git') + '/source_map_stack_trace.git@741b6ceb4b6cdb8ff620664337d7ecc63ca52cc1',
462462

463463
'src/flutter/third_party/dart/third_party/pkg/source_maps':
464-
Var('dart_git') + '/source_maps.git@5f82c613664ade03c7a6d0e6c59687c69dec894b',
464+
Var('dart_git') + '/source_maps.git@caa79c2011015759c6cf3299f299f5cccdf8bb61',
465465

466466
'src/flutter/third_party/dart/third_party/pkg/source_span':
467-
Var('dart_git') + '/source_span.git@f81cd4a2df630a97264fb4015fb93944b5b98b11',
467+
Var('dart_git') + '/source_span.git@89520f3009e332ce2b6675f71dca166521c36cc4',
468468

469469
'src/flutter/third_party/dart/third_party/pkg/sse':
470470
Var('dart_git') + '/sse.git@52d042ff9ab2d0e5bc26805d74a03077a67861e1',
@@ -485,7 +485,7 @@ deps = {
485485
Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
486486

487487
'src/flutter/third_party/dart/third_party/pkg/test':
488-
Var('dart_git') + '/test.git@14f9b3ec7e06f987dd70bb1f47267462ce218048',
488+
Var('dart_git') + '/test.git@3256c23cc753a184bb3bf27610a7c8410735e3ac',
489489

490490
'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
491491
Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
@@ -518,7 +518,7 @@ deps = {
518518
Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
519519

520520
'src/flutter/third_party/dart/tools/sdks/dart-sdk':
521-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:7e6469bd51d404916395a47b011d907d2c905121'}]},
521+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.5.0-278.0.dev'}]},
522522

523523
# WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
524524

‎ci/licenses_golden/licenses_dart‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: cdf0a0115b34b2592fab6d9570fce532
1+
Signature: 987cab3f3e3a6e4e7248b7606f819b61
22

33
====================================================================================================
44
LIBRARY: dart
@@ -4086,10 +4086,7 @@ ORIGIN: ../../../flutter/third_party/dart/runtime/vm/compiler/backend/dart_calli
40864086
ORIGIN: ../../../flutter/third_party/dart/runtime/vm/heap/incremental_compactor.cc + ../../../flutter/third_party/dart/LICENSE
40874087
ORIGIN: ../../../flutter/third_party/dart/runtime/vm/heap/incremental_compactor.h + ../../../flutter/third_party/dart/LICENSE
40884088
ORIGIN: ../../../flutter/third_party/dart/runtime/vm/os.cc + ../../../flutter/third_party/dart/LICENSE
4089-
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/custom_hash_set.dart + ../../../flutter/third_party/dart/LICENSE
40904089
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_only.dart + ../../../flutter/third_party/dart/LICENSE
4091-
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/identity_hash_set.dart + ../../../flutter/third_party/dart/LICENSE
4092-
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/linked_hash_set.dart + ../../../flutter/third_party/dart/LICENSE
40934090
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js_only.dart + ../../../flutter/third_party/dart/LICENSE
40944091
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/invocation_mirror_constants.dart + ../../../flutter/third_party/dart/LICENSE
40954092
ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/date_time_patch.dart + ../../../flutter/third_party/dart/LICENSE
@@ -4109,10 +4106,7 @@ FILE: ../../../flutter/third_party/dart/runtime/vm/compiler/backend/dart_calling
41094106
FILE: ../../../flutter/third_party/dart/runtime/vm/heap/incremental_compactor.cc
41104107
FILE: ../../../flutter/third_party/dart/runtime/vm/heap/incremental_compactor.h
41114108
FILE: ../../../flutter/third_party/dart/runtime/vm/os.cc
4112-
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/custom_hash_set.dart
41134109
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_only.dart
4114-
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/identity_hash_set.dart
4115-
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/linked_hash_set.dart
41164110
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js_only.dart
41174111
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/invocation_mirror_constants.dart
41184112
FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/date_time_patch.dart
@@ -4757,7 +4751,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
47574751
This Source Code Form is "Incompatible With Secondary Licenses", as
47584752
defined by the Mozilla Public License, v. 2.0.
47594753

4760-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/33b65d2fe034322e507db54aa05c0e29b96a5478
4754+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/ffc8bb004a64f6357e3d5d1185e974e966f00931
47614755
/third_party/fallback_root_certificates/
47624756

47634757
====================================================================================================

‎sky/packages/sky_engine/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31897,7 +31897,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
3189731897
This Source Code Form is "Incompatible With Secondary Licenses", as
3189831898
defined by the Mozilla Public License, v. 2.0.
3189931899

31900-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/726cb2467f27d49531551e6a03f14a3ce2f5e283
31900+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/ffc8bb004a64f6357e3d5d1185e974e966f00931
3190131901
/third_party/fallback_root_certificates/
3190231902

3190331903
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)