Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,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': 'd916a5f69a486de98316900f19ef0ff46834b03d',
'dart_revision': '2bf0f2b8d39100b37b82fb8b936f2ecad1070af3',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand All @@ -65,19 +65,19 @@ vars = {
'dart_boringssl_rev': '2db0eb3f96a5756298dcd7f9319e56a98585bd10',
'dart_browser_launcher_rev': 'e5fc5d488eb5038bfec2a6690c72ab8dd353e101',
'dart_clock_rev': '7956d60042f4ea979c4554d43eeb57d087627869',
'dart_collection_rev': '24b75d85df6a26aac7be13b56ff1ce4360c04a64',
'dart_collection_rev': '887b826b50f48d6a9cd2c0684aa353e8e3a0fad0',
'dart_devtools_rev': 'dcef4f6efe986f110f55dbbe7f3731802e86690a',
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
'dart_pub_rev': '1efd3f5e274e153637d99698b0ee454f6f2550ab',
'dart_tools_rev': 'd4995d47b99d5e9564abfed2218f4a23df75983b',
'dart_tools_rev': 'f882de9ba86712003728d4663e1b73a620d352b1',
'dart_watcher_rev': '3b850778ad0b62db3aa2cfe48832870c2461db30',
'dart_web_rev': '8478cd27d574249eca3d41f9135458dfda2762c8',
'dart_webdev_rev': '5f30c560dc4e3df341356c43ec1a766ee6b74a7c',
'dart_webkit_inspection_protocol_rev': 'b459c427b74bf5e0919a083a97a167fb74d8bff1',
'dart_yaml_edit_rev': '5c54d455f272bbb83c948ac420c677371e69ae77',
'dart_yaml_edit_rev': '35f4248c7bbba289b3899fa55486e2f31ef1a8c5',

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

Expand Down Expand Up @@ -346,13 +346,13 @@ deps = {
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@459bc0797f67cb2a8fd4598bb7143b34036608d9',

'src/flutter/third_party/dart/third_party/devtools':
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:f5e84f91b32b219d646cfb87a891cd143dc84056'}]},
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:dcef4f6efe986f110f55dbbe7f3731802e86690a'}]},

'src/flutter/third_party/dart/third_party/pkg/args':
Var('dart_git') + '/args.git@e623652744c82533829f2e62b1aba1a6cf06e291',
Var('dart_git') + '/args.git@09c0fca1785c9df39288a48f767994eed80bed40',

'src/flutter/third_party/dart/third_party/pkg/async':
Var('dart_git') + '/async.git@c0d81f8699682d01d657a9bf827107d11904a247',
Var('dart_git') + '/async.git@5f70a996f673d625e3502597084653686c3e754c',

'src/flutter/third_party/dart/third_party/pkg/bazel_worker':
Var('dart_git') + '/bazel_worker.git@aa3cc9e826350b960e0c5a67e6065bcedba8b0ac',
Expand All @@ -373,10 +373,10 @@ deps = {
Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),

'src/flutter/third_party/dart/third_party/pkg/convert':
Var('dart_git') + '/convert.git@9035cafefc1da4315f26058734d0c2a19d5ab56a',
Var('dart_git') + '/convert.git@d361833e117cb2438d2a2a6d0b0acb28ff0910fb',

'src/flutter/third_party/dart/third_party/pkg/crypto':
Var('dart_git') + '/crypto.git@eede7d6918c51159c1422b7449f40dbac660ee57',
Var('dart_git') + '/crypto.git@3d26ef4cf22d4b218ba30e616544ad3cf52f64a1',

'src/flutter/third_party/dart/third_party/pkg/csslib':
Var('dart_git') + '/csslib.git@a3700b05bbcc42782e8a7024790dbf019d89c249',
Expand All @@ -385,7 +385,7 @@ deps = {
Var('dart_git') + '/dart_style.git@5d35f4d829ffb8532d345d95d3e9504ae6cd839e',

'src/flutter/third_party/dart/third_party/pkg/dartdoc':
Var('dart_git') + '/dartdoc.git@5df03dd913a0a2e20421cac61112aa84111160e0',
Var('dart_git') + '/dartdoc.git@80c6f18f34b387d4b9ce89ddd2e3049093335f9d',

'src/flutter/third_party/dart/third_party/pkg/file':
Var('dart_git') + '/external/github.com/google/file.dart@6842feaef1c4e06239bd30f8d3ef722838b1c97e',
Expand All @@ -406,13 +406,13 @@ deps = {
Var('dart_git') + '/http_multi_server.git@e7515b5896b83d522189802a1e14e103e19426c0',

'src/flutter/third_party/dart/third_party/pkg/http_parser':
Var('dart_git') + '/http_parser.git@ce528cf82f3d26ac761e29b2494a9e0c270d4939',
Var('dart_git') + '/http_parser.git@23d775898ee90be9daf3297e298a8869bc755d84',

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

'src/flutter/third_party/dart/third_party/pkg/json_rpc_2':
Var('dart_git') + '/json_rpc_2.git@b4810dc7bee5828f240586c81f3f34853cacdbce',
Var('dart_git') + '/json_rpc_2.git@c9b616bded8cdb5bfdc836ba7648afa6aba40062',

'src/flutter/third_party/dart/third_party/pkg/leak_tracker':
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
Expand All @@ -427,7 +427,7 @@ deps = {
Var('dart_git') + '/matcher.git@31f13583630e093731c8cf2b843c14196d748c5c',

'src/flutter/third_party/dart/third_party/pkg/mockito':
Var('dart_git') + '/mockito.git@3de67548e833a8eef66a2a49070b197c2c08b3ab',
Var('dart_git') + '/mockito.git@57d484f9b8e7f6a504966a901174358a42fa932a',

'src/flutter/third_party/dart/third_party/pkg/native':
Var('dart_git') + '/native.git@659511886501bcce638c3966590df04984909ef0',
Expand All @@ -439,7 +439,7 @@ deps = {
Var('dart_git') + '/path.git@e969f42ed112dd702a9453beb9df6c12ae2d3805',

'src/flutter/third_party/dart/third_party/pkg/pool':
Var('dart_git') + '/pool.git@924fb04353cec915d927f9f1aed88e2eda92b98a',
Var('dart_git') + '/pool.git@7bfc71b39742753a88688e56e55a828a2f5dc0bf',

'src/flutter/third_party/dart/third_party/pkg/protobuf':
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
Expand Down Expand Up @@ -469,10 +469,10 @@ deps = {
Var('dart_git') + '/stream_channel.git@f4407168b275fcde9187baefd7dbce76d0992825',

'src/flutter/third_party/dart/third_party/pkg/string_scanner':
Var('dart_git') + '/string_scanner.git@2139417ffcd0392bde3ba9bc83ee13eaa5fbed01',
Var('dart_git') + '/string_scanner.git@084b201c54b168aced178fff41fce71e3869ae42',

'src/flutter/third_party/dart/third_party/pkg/tar':
Var('dart_git') + '/external/github.com/simolus3/tar.git@32ceb55e673141abff4e84b99483fe5eb881c291',
Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',

'src/flutter/third_party/dart/third_party/pkg/term_glyph':
Var('dart_git') + '/term_glyph.git@19d8c08a4e81122639129c62049896021910c932',
Expand All @@ -487,7 +487,7 @@ deps = {
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),

'src/flutter/third_party/dart/third_party/pkg/typed_data':
Var('dart_git') + '/typed_data.git@2bb9e6ead6394e2d4ec6068c5ece8b2ec0e2b945',
Var('dart_git') + '/typed_data.git@6abfafdcf661cd8a814619d7e2a3e99edb3a3862',

'src/flutter/third_party/dart/third_party/pkg/watcher':
Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
Expand All @@ -496,7 +496,7 @@ deps = {
Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),

'src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
Var('dart_git') + '/web_socket_channel.git@0e1d6e2eb5a0bfd62e45b772ac7107d796176cf6',
Var('dart_git') + '/web_socket_channel.git@40aa29f1d2167467f5934d755891a8beb62a1239',

'src/flutter/third_party/dart/third_party/pkg/webdev':
Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
Expand Down
1 change: 0 additions & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ linter:
- avoid_init_to_null
- avoid_js_rounded_ints
# - avoid_multiple_declarations_per_line # seems to be a stylistic choice we don't subscribe to
- avoid_null_checks_in_equality_operators
# - avoid_positional_boolean_parameters # would have been nice to enable this but by now there's too many places that break it
- avoid_print
# - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
Expand Down
7 changes: 6 additions & 1 deletion ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -1444,6 +1444,11 @@
../../../flutter/third_party/dart/runtime/tools/heapsnapshot/README.md
../../../flutter/third_party/dart/runtime/tools/heapsnapshot/pubspec.yaml
../../../flutter/third_party/dart/runtime/tools/heapsnapshot/test
../../../flutter/third_party/dart/runtime/tools/profiling/.gitignore
../../../flutter/third_party/dart/runtime/tools/profiling/CHANGELOG.md
../../../flutter/third_party/dart/runtime/tools/profiling/README.md
../../../flutter/third_party/dart/runtime/tools/profiling/analysis_options.yaml
../../../flutter/third_party/dart/runtime/tools/profiling/pubspec.yaml
../../../flutter/third_party/dart/runtime/tools/utils.py
../../../flutter/third_party/dart/runtime/tools/valgrind.py
../../../flutter/third_party/dart/runtime/tools/wiki/README.md
Expand Down Expand Up @@ -1565,7 +1570,7 @@
../../../flutter/third_party/dart/runtime/vm/port_test.cc
../../../flutter/third_party/dart/runtime/vm/profiler_test.cc
../../../flutter/third_party/dart/runtime/vm/protos/.gitignore
../../../flutter/third_party/dart/runtime/vm/regexp_test.cc
../../../flutter/third_party/dart/runtime/vm/regexp/regexp_test.cc
../../../flutter/third_party/dart/runtime/vm/ring_buffer_test.cc
../../../flutter/third_party/dart/runtime/vm/scopes_test.cc
../../../flutter/third_party/dart/runtime/vm/service
Expand Down
Loading