Skip to content
Open
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
56 changes: 28 additions & 28 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ vars = {
# updates to Clang Tidy will not turn the tree red.
#
# See https://github.com/flutter/flutter/wiki/Engine-pre‐submits-and-post‐submits#post-submit
'clang_version': 'git_revision:80743bd43fd5b38fedc503308e7a652e23d3ec93',
'clang_version': 'git_revision:07d67299a15ce03b053736e2d31a668ee0576987',

'reclient_version': 're_client_version:0.185.0.db415f21-gomaip',

Expand All @@ -47,25 +47,25 @@ vars = {
# updated revision list of existing dependencies. You will need to
# gclient sync before and after update deps to ensure all deps are updated.
# updated revision list of existing dependencies.
'dart_revision': 'bb17f25f176f5209179b23d51aab9725ffb5146d',
'dart_revision': '0e7642b85457515cfac6ffda9e0e10906a5e5356',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
'dart_binaryen_rev': '9926156a583cec3d22d521232b31c70fa9a87dc1',
'dart_boringssl_rev': '7515be5ccd601ae0433d3682ba7737592b402014',
'dart_core_rev': 'fe516ee1b38cc60e7a8c6e082c337037a043d782',
'dart_devtools_rev': '21f1838f3a9b138ac377efb953ca5a53c8832e75',
'dart_ecosystem_rev': 'edfdb3b4063b9034b708144633a700204f865f43',
'dart_http_rev': '5d94ef52582867e077bf41c3fa20fb8b1d1d834e',
'dart_i18n_rev': 'e1b5a798f8922bb27bbc6d858748ece6f9a19f02',
'dart_boringssl_rev': '1097261733d85c85147a5c96ff6ee835c90f5951',
'dart_core_rev': '08e4022160c465780690c43ffdbce60812975d2c',
'dart_devtools_rev': 'fd39ed6deeed50104b5262d8228f5ae3ceab7bfd',
'dart_ecosystem_rev': '16dca7ae5d3ff896a4db47e1ed6cd50f7ebbf115',
'dart_http_rev': 'd8e8e9cd1ae6ed0f0339cfa0f47f92e837a786f5',
'dart_i18n_rev': '1f5ea2fb2381bdf7bab054a43c0d69771f104561',
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
'dart_protobuf_rev': '91efb90f437bb6a30e6726c3369a2fcb9bba06e7',
'dart_pub_rev': 'ec276d10a7fa0f6c6ec005340fb9ad29f3b012d0',
'dart_protobuf_rev': 'a73edc98c98fb25152aa3f12c1b9db91594c1369',
'dart_pub_rev': '0382a52acba89ff0080d559bb22f4017962bbd1d',
'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
'dart_tools_rev': 'b827a6e38b934232c7f7b8728a5aef6165e7df2d',
'dart_tools_rev': '3614ce064ae452a15e83de3531236f5f89dfa526',
'dart_vector_math_rev': 'cf3b5db7340d317dd3489e5a35434b408020a852',
'dart_web_rev': '12a9ca2ebc08f5a6f2d69aebc7daa1f5a2e6a431',
'dart_webdriver_rev': '3a711ebb36871eac997c5d5d2429f7414873dc63',
'dart_web_rev': 'e5c6c028da66688a2295557757850a1599ec392e',
'dart_webdriver_rev': '8e5c611ea242efdc9f597a8a37c38a9c586120ee',
'dart_webkit_inspection_protocol_rev': '762115a971d1968bc940454ad1e88d506d8c5640',

'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
Expand Down Expand Up @@ -181,11 +181,11 @@ vars = {
# The version / instance id of the cipd:chromium/fuchsia/test-scripts which
# will be used altogether with fuchsia-sdk to setup the build / test
# environment.
'fuchsia_test_scripts_version': 'vcANVO8VIDQHasH1X_XRoSYLvx7fNwvTbDM1NT9TwA4C',
'fuchsia_test_scripts_version': 'whZAV1mfT-Rdc0rQ81s_IEef2L7kbGPFtiQPitjf_akC',

# The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
# used altogether with fuchsia-sdk to generate gn based build rules.
'fuchsia_gn_sdk_version': 'a87CbQSWEjkPUK1ZY_zsy8aZ9W-3Z2v73ohzhrWbDQ4C',
'fuchsia_gn_sdk_version': 'PDJz3b3CL31uoLOkDb0mm8FidqJ1eCJryoRFd9iVmbIC',
}

gclient_gn_args_file = 'engine/src/flutter/third_party/dart/build/config/gclient_args.gni'
Expand Down Expand Up @@ -225,7 +225,7 @@ deps = {
Var('llvm_git') + '/llvm-project/libc' + '@' + '5af39a19a1ad51ce93972cdab206dcd3ff9b6afa',

'engine/src/flutter/third_party/icu':
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'd578f2e8b7bd5938e21cfb6bf15c079e0aa5b738',
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '6ebb40c594776cc2c21ea14df85a2a89a328b364',

'engine/src/flutter/third_party/gtest-parallel':
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
Expand Down Expand Up @@ -257,7 +257,7 @@ deps = {
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git' + '@' + Var('dart_binaryen_rev'),

'engine/src/flutter/third_party/dart/third_party/devtools':
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:21f1838f3a9b138ac377efb953ca5a53c8832e75'}]},
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:fd39ed6deeed50104b5262d8228f5ae3ceab7bfd'}]},

'engine/src/flutter/third_party/dart/third_party/perfetto/src':
Var('chromium_git') + '/external/github.com/google/perfetto' + '@' + Var('dart_perfetto_rev'),
Expand All @@ -266,10 +266,10 @@ deps = {
Var('dart_git') + '/core.git' + '@' + Var('dart_core_rev'),

'engine/src/flutter/third_party/dart/third_party/pkg/dart_style':
Var('dart_git') + '/dart_style.git@dfdf6420c7ea923d28edef3f11e89b4ff23d03bf',
Var('dart_git') + '/dart_style.git@5a9534fad9ff2faba89596a70323d2b1f1bcf163',

'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
Var('dart_git') + '/dartdoc.git@ac96918074974dcd4ea20f764f17090f58c1e428',
Var('dart_git') + '/dartdoc.git@c68debcb5636ba8d66210110092d39d5b06f8225',

'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
Expand All @@ -284,7 +284,7 @@ deps = {
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',

'engine/src/flutter/third_party/dart/third_party/pkg/native':
Var('dart_git') + '/native.git@046f63d1d89cd9954623bfa2df9c69d1a395375e',
Var('dart_git') + '/native.git@f628b26f039c3824d83c352c489fd1a4496780d0',

'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
Expand All @@ -293,7 +293,7 @@ deps = {
Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),

'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
Var('dart_git') + '/shelf.git@6918a7690946044b4098e9f6735439044c676e13',
Var('dart_git') + '/shelf.git@e5c8dc663bf1325ad8f997c4a2387923d37a90d9',

'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
Expand All @@ -302,7 +302,7 @@ deps = {
Var('dart_git') + '/external/github.com/simolus3/tar.git@13479f7c2a18f499e840ad470cfcca8c579f6909',

'engine/src/flutter/third_party/dart/third_party/pkg/test':
Var('dart_git') + '/test.git@bd92e633e7f05edc3301865bdc00d1ae181cb1f1',
Var('dart_git') + '/test.git@9946c9551ddaffd6092c22372b7e146600aa3264',

'engine/src/flutter/third_party/dart/third_party/pkg/tools':
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
Expand All @@ -320,7 +320,7 @@ deps = {
Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),

'engine/src/flutter/third_party/dart/tools/sdks/dart-sdk':
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.14.0-75.0.dev'}]},
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'version:3.14.0-226.0.dev'}]},

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

Expand Down Expand Up @@ -432,13 +432,13 @@ deps = {
Var('chromium_git') + '/external/github.com/libexpat/libexpat.git' + '@' + '8e49998f003d693213b538ef765814c7d21abada',

'engine/src/flutter/third_party/freetype2':
Var('flutter_git') + '/third_party/freetype2' + '@' + 'be4bcb57914154fc1b9e2900bf8e4b516057e2b8',
Var('flutter_git') + '/third_party/freetype2' + '@' + 'db7276fd53cda30c7f0fcd6b11e2e8f43b4b5e82',

'engine/src/flutter/third_party/ocmock':
Var('flutter_git') + '/third_party/ocmock' + '@' + Var('ocmock_rev'),

'engine/src/flutter/third_party/libpng':
Var('flutter_git') + '/third_party/libpng' + '@' + 'b6004397d2ab98f0250376d9b357337b7f422d13',
Var('flutter_git') + '/third_party/libpng' + '@' + 'ced6b6c0c1e24716423a417b399d3c7d4623890d',

'engine/src/flutter/third_party/zlib':
Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '7eda07b1e067ef3fd7eea0419c88b5af45c9a776',
Expand Down Expand Up @@ -497,7 +497,7 @@ deps = {
{
# See tools/gradle/README.md for update instructions.
# Version here means the CIPD tag.
'version': 'version:9.3.1',
'version': 'version:9.5.0',
'package': 'flutter/gradle'
}
],
Expand Down Expand Up @@ -693,7 +693,7 @@ deps = {
'packages': [
{
'package': 'flutter_internal/rbe/reclient_cfgs',
'version': '0vARzGeIZgIhW7zVfWuqIPQ_HXMLDccjAstykWZKjaEC',
'version': 'Vk7WiSKwQdBHbCrZ9PtRl3po2WpRFQZSag9M6-sxF_0C',
}
],
'condition': 'use_rbe',
Expand Down Expand Up @@ -729,7 +729,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/sdk/core/linux-amd64',
'version': '_J8wM3kyQpLN9wvRD5upBr9L1g5TCYF3Oc8P0m3QeZMC'
'version': 'ukukV5lEkKabtOATkSbVa6yIaU7g4nfmCcVvWNxfMQMC'
}
],
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',
Expand Down
1 change: 0 additions & 1 deletion engine/src/flutter/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ group("flutter") {
"//flutter/build/dart/test:gen_dartcli_call",
"//flutter/build/dart/test:gen_executable_call",
"//flutter/shell/testing",
"//flutter/tools/const_finder",
"//flutter/tools/engine_tool:tests",
"//flutter/tools/font_subset",
]
Expand Down
5 changes: 3 additions & 2 deletions engine/src/flutter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ name: _engine_workspace

# Required for workspace support.
environment:
sdk: ^3.9.0-0
sdk: ^3.13.0-0

# Declare all packages that are part of the workspace.
workspace:
Expand All @@ -93,7 +93,6 @@ workspace:
- tools/build_bucket_golden_scraper
- tools/clang_tidy
- tools/clangd_check
- tools/const_finder
- tools/engine_tool
- tools/header_guard_check
- tools/gen_web_locale_keymap
Expand Down Expand Up @@ -174,6 +173,8 @@ dependency_overrides:
path: ./third_party/dart/third_party/pkg/tools/pkgs/boolean_selector
cli_config:
path: ./third_party/dart/third_party/pkg/tools/pkgs/cli_config
cli_util:
path: ./third_party/dart/third_party/pkg/tools/pkgs/cli_util
collection:
path: ./third_party/dart/third_party/pkg/core/pkgs/collection
convert:
Expand Down
1 change: 0 additions & 1 deletion engine/src/flutter/testing/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,6 @@ def build_dart_host_test_list():
os.path.join('flutter', 'tools', 'api_check'),
os.path.join('flutter', 'tools', 'build_bucket_golden_scraper'),
os.path.join('flutter', 'tools', 'clang_tidy'),
os.path.join('flutter', 'tools', 'const_finder'),
os.path.join('flutter', 'tools', 'engine_tool'),
os.path.join('flutter', 'tools', 'githooks'),
os.path.join('flutter', 'tools', 'header_guard_check'),
Expand Down
5 changes: 0 additions & 5 deletions engine/src/flutter/tools/const_finder/.gitignore

This file was deleted.

16 changes: 0 additions & 16 deletions engine/src/flutter/tools/const_finder/BUILD.gn

This file was deleted.

11 changes: 0 additions & 11 deletions engine/src/flutter/tools/const_finder/README.md

This file was deleted.

114 changes: 0 additions & 114 deletions engine/src/flutter/tools/const_finder/bin/main.dart

This file was deleted.

23 changes: 0 additions & 23 deletions engine/src/flutter/tools/const_finder/pubspec.yaml

This file was deleted.

Loading
Loading