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

Commit c9b5c9f

Browse files
committed
Merge remote-tracking branch 'upstream/main' into rotate_color
2 parents 83465cf + 43a5c86 commit c9b5c9f

File tree

98 files changed

+882
-1092
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+882
-1092
lines changed

.ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ targets:
304304
{"download_emsdk": true}
305305
dependencies: >-
306306
[
307-
{"dependency": "chrome_and_driver", "version": "version:111.0"},
307+
{"dependency": "chrome_and_driver", "version": "version:111.0a"},
308308
{"dependency": "curl", "version": "version:7.64.0"}
309309
]
310310
framework: "true"

DEPS

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': 'ad459a5b8df474d881209696b3fb4f038e0d3a55',
21+
'skia_revision': '827013b3dbef2cf91399d3516e36c050719040bb',
2222

2323
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2424
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -48,7 +48,7 @@ vars = {
4848
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
4949
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5050
# updated revision list of existing dependencies.
51-
'dart_revision': 'f08901c71710db0df616d29a969a3aa15f1b92a9',
51+
'dart_revision': '73127306ac6bd0db1ce3ca6c6a0b77dc26241b5e',
5252

5353
# WARNING: DO NOT EDIT MANUALLY
5454
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -57,16 +57,16 @@ vars = {
5757
'dart_boringssl_rev': '87f316d7748268eb56f2dc147bd593254ae93198',
5858
'dart_browser_launcher_rev': 'bc2dc4ef53a6619032e9f01450848e9ed40a9437',
5959
'dart_clock_rev': '984642ee406e951e398ae5e47671383990da1c98',
60-
'dart_collection_rev': '0d0e184a5f70ca4e23dab23df686127ec40bfb11',
61-
'dart_devtools_rev': 'bf15e7348d53dc83531d503be94e0c035b604984',
60+
'dart_collection_rev': '30fd0f8af28bce036bec94ae6852fc330ce56f41',
61+
'dart_devtools_rev': '0d0b7c113bf7bde43181564820d56bd95173ff94',
6262
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
6363
'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
6464
'dart_protobuf_gn_rev': 'f872f05cb0378eef9a7a2609076929f0f35b4141',
6565
'dart_protobuf_rev': 'b90a4c44d56075eb23ee38ae56ce0febfd7f280f',
6666
'dart_pub_rev': '196e89e5716d64b2954021e6ac9bb5a20d975fc6',
6767
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
6868
'dart_watcher_rev': '5968409e1d73e21e75fc22a6481d5efaef7f3558',
69-
'dart_webdev_rev': 'c2c8b17c9a1adc19ee3efd847ed2dd6cd7025aec',
69+
'dart_webdev_rev': 'b139649e8381a36ed72c4f823eb2af6ddc1e8bc4',
7070
'dart_webkit_inspection_protocol_rev': '8401098ace995e4dcd9855a2741c2dacccaa780b',
7171
'dart_yaml_edit_rev': 'fbc5cb3ced4b9862b8acfd646389d4fbbd4074d1',
7272
'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
@@ -314,7 +314,7 @@ deps = {
314314
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@b9b5f162ca8bf5b899ff0f0351491d7d403d7ed9',
315315

316316
'src/third_party/dart/third_party/devtools':
317-
{'packages': [{'version': 'git_revision:bf15e7348d53dc83531d503be94e0c035b604984', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
317+
{'packages': [{'version': 'git_revision:0d0b7c113bf7bde43181564820d56bd95173ff94', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
318318

319319
'src/third_party/dart/third_party/pkg/args':
320320
Var('dart_git') + '/args.git@7a5e3b07c882d300a570031df8a45f8a0b067053',
@@ -332,7 +332,7 @@ deps = {
332332
Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
333333

334334
'src/third_party/dart/third_party/pkg/cli_util':
335-
Var('dart_git') + '/cli_util.git@91747f7dd9bdf2457f081d3cf035de5672dd4a02',
335+
Var('dart_git') + '/cli_util.git@6c318c29c4ad0efcbe2e847dd5cebac1e379c8f5',
336336

337337
'src/third_party/dart/third_party/pkg/clock':
338338
Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -353,10 +353,10 @@ deps = {
353353
Var('dart_git') + '/dart_style.git@568333db2650e77c0f96ebc77969c9469cf514f0',
354354

355355
'src/third_party/dart/third_party/pkg/dartdoc':
356-
Var('dart_git') + '/dartdoc.git@0746cdae534decbf3763ca460024f392a079d1c2',
356+
Var('dart_git') + '/dartdoc.git@9be04e0c85584b261c7edec312a3fa0a84dcb21f',
357357

358358
'src/third_party/dart/third_party/pkg/ffi':
359-
Var('dart_git') + '/ffi.git@32f5eefea59d4461e8ab40e83f157e49d5abe0da',
359+
Var('dart_git') + '/ffi.git@04fa38ab45cb2957f9059e03031b53906c2c4385',
360360

361361
'src/third_party/dart/third_party/pkg/file':
362362
Var('dart_git') + '/external/github.com/google/file.dart@72a67c33f90bfb7e10057e286e06d2fe3baa4d98',
@@ -380,37 +380,37 @@ deps = {
380380
Var('dart_git') + '/http_parser.git@b3b283b9f139640b932d604e8815460bbd3ecab5',
381381

382382
'src/third_party/dart/third_party/pkg/intl':
383-
Var('dart_git') + '/intl.git@fca552f2ec5d682b5fa36f02bdd72a5a4e2edcee',
383+
Var('dart_git') + '/intl.git@a958db01c90d041f0cd357d1732ae9813b620ee0',
384384

385385
'src/third_party/dart/third_party/pkg/json_rpc_2':
386-
Var('dart_git') + '/json_rpc_2.git@0280ac6cb4f3905d81c47ba927123ba2b95f7940',
386+
Var('dart_git') + '/json_rpc_2.git@aea3bea2d2be0113593a5c813d2ed3d2362200b6',
387387

388388
'src/third_party/dart/third_party/pkg/linter':
389-
Var('dart_git') + '/linter.git@9a586c9deeb53177a02b37807b0f792893092cae',
389+
Var('dart_git') + '/linter.git@b56190503725de2125b626ff1b3423192fa1f7ae',
390390

391391
'src/third_party/dart/third_party/pkg/logging':
392392
Var('dart_git') + '/logging.git@abef3717d958158eb8b0ddb2871f4b15a9804cd4',
393393

394394
'src/third_party/dart/third_party/pkg/markdown':
395-
Var('dart_git') + '/markdown.git@ecbffa9bf9109d490b9388e9cb1f2bb801aee63c',
395+
Var('dart_git') + '/markdown.git@d437c85188806fe2bfa4f3616159300ba9dc6d2a',
396396

397397
'src/third_party/dart/third_party/pkg/matcher':
398-
Var('dart_git') + '/matcher.git@dc310d95663da10a90e7898cd4e322695f693d4f',
398+
Var('dart_git') + '/matcher.git@61f43473951ce425982c2cfb694f3fbe50b1655e',
399399

400400
'src/third_party/dart/third_party/pkg/mime':
401401
Var('dart_git') + '/mime.git@1a51be02b3cbc742c79d83575bd096ae8c295c1f',
402402

403403
'src/third_party/dart/third_party/pkg/mockito':
404-
Var('dart_git') + '/mockito.git@ed5bd84f7bd7b651c96fbd7f449e92984a902502',
404+
Var('dart_git') + '/mockito.git@28e8eda2ef16f2e9c5e2e8fef48a834afd33ce44',
405405

406406
'src/third_party/dart/third_party/pkg/package_config':
407407
Var('dart_git') + '/package_config.git@74ac1cb90ad7f4f05bd92c952eaf9756c516fca3',
408408

409409
'src/third_party/dart/third_party/pkg/path':
410-
Var('dart_git') + '/path.git@24b58a2499440cc3d12d2b3c2f52b95f91ff1c0a',
410+
Var('dart_git') + '/path.git@cd37179fe802853f0a5967d3eceb0269e1834b32',
411411

412412
'src/third_party/dart/third_party/pkg/pool':
413-
Var('dart_git') + '/pool.git@694cfd867d8d84857fc42a8d07933013f0d25305',
413+
Var('dart_git') + '/pool.git@338bfb4e96ba04ae166a5d76249f66fb8284f4b3',
414414

415415
'src/third_party/dart/third_party/pkg/protobuf':
416416
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -425,7 +425,7 @@ deps = {
425425
Var('dart_git') + '/shelf.git@9a792b49f07bd9d310d83cd103035cc60a9956af',
426426

427427
'src/third_party/dart/third_party/pkg/source_map_stack_trace':
428-
Var('dart_git') + '/source_map_stack_trace.git@45ea3688b6bec1eb565c38c4e28f37b01f8a0fa9',
428+
Var('dart_git') + '/source_map_stack_trace.git@08a81a81710fe1442a705c5761bccf3280940a9c',
429429

430430
'src/third_party/dart/third_party/pkg/source_maps':
431431
Var('dart_git') + '/source_maps.git@a112e981a985a8af2047ee25a9cf56b0d5413b02',
@@ -434,31 +434,31 @@ deps = {
434434
Var('dart_git') + '/source_span.git@3951ba50ec29b9870c3131c6ddcc88700d26f3ee',
435435

436436
'src/third_party/dart/third_party/pkg/sse':
437-
Var('dart_git') + '/sse.git@8c03b73f90d951f5b33dd496593718107c79f97a',
437+
Var('dart_git') + '/sse.git@8c3efdcf6ee823425b78e17d1347e5b800a0186e',
438438

439439
'src/third_party/dart/third_party/pkg/stack_trace':
440440
Var('dart_git') + '/stack_trace.git@6ceb191ace71c18ccf5648f6b2e8be52da39c56f',
441441

442442
'src/third_party/dart/third_party/pkg/stream_channel':
443-
Var('dart_git') + '/stream_channel.git@a20ccd4142947637213393803289787a233402a1',
443+
Var('dart_git') + '/stream_channel.git@fe0f5e4f5a308eb5f05bbb9d0f52a68485538c36',
444444

445445
'src/third_party/dart/third_party/pkg/string_scanner':
446-
Var('dart_git') + '/string_scanner.git@29e471ea98762db8052cca0e6a69ef9c7999abed',
446+
Var('dart_git') + '/string_scanner.git@f7a656fdaaab069fc6f8c9d34d3205ce6100dfb1',
447447

448448
'src/third_party/dart/third_party/pkg/term_glyph':
449449
Var('dart_git') + '/term_glyph.git@d275a8f7482b6a5e4f15d0da6feb66c24f52eb94',
450450

451451
'src/third_party/dart/third_party/pkg/test':
452-
Var('dart_git') + '/test.git@cc0598b2c3bf3a7439f10f9542a8d01ff50b69e9',
452+
Var('dart_git') + '/test.git@a01b185ea7939b0867361693d2a85d9865c876fd',
453453

454454
'src/third_party/dart/third_party/pkg/test_reflective_loader':
455-
Var('dart_git') + '/test_reflective_loader.git@c4c2d5c3f94a96f3fc79e9e28944fba391bc544c',
455+
Var('dart_git') + '/test_reflective_loader.git@a85a930ad3736f93b96f6cc104d3576c1ae19e0e',
456456

457457
'src/third_party/dart/third_party/pkg/tools':
458-
Var('dart_git') + '/tools.git@fb2dada0f453a300659e6a2524fdcaed16056235',
458+
Var('dart_git') + '/tools.git@d40ca93ca6ffc42e90cdbff742ce279a5d4ef808',
459459

460460
'src/third_party/dart/third_party/pkg/typed_data':
461-
Var('dart_git') + '/typed_data.git@f858046fb420cf644e7d8cb86b7893f2830d8a6c',
461+
Var('dart_git') + '/typed_data.git@d85363d2efb333afce07ec409a529ec32986e1a2',
462462

463463
'src/third_party/dart/third_party/pkg/usage':
464464
Var('dart_git') + '/usage.git@399770f45ed2d384d79395c0341a04fb25609a4d',

0 commit comments

Comments
 (0)