Skip to content

Commit

Permalink
Update the engine deps to track new SoT git locations for several pac…
Browse files Browse the repository at this point in the history
…kages (#56028)

This PR updates the deps and pubspec overrides to track the new SoT of
several Dart core packages (these now live in dart-lang/core).

- `package:args`
- `package:async`
- `package:convert`
- `package:crypto`
- `package:fixnum`
- `package:logging`
- `package:path`
- `package:platform`
- `package:typed_data`

issues
- dart-lang/sdk#56591

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide] and the [C++,
Objective-C, Java style guides].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [ ] I added new tests to check the change I am making or feature I am
adding, or the PR is [test-exempt]. See [testing the engine] for
instructions on writing and running engine tests.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] I signed the [CLA].
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
[test-exempt]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
[C++, Objective-C, Java style guides]:
https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
[testing the engine]:
https://github.com/flutter/flutter/wiki/Testing-the-engine
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
[Discord]: https://github.com/flutter/flutter/wiki/Chat
  • Loading branch information
devoncarew authored Oct 23, 2024
1 parent 19f9c5a commit 6620f42
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 64 deletions.
54 changes: 11 additions & 43 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ vars = {
'dart_browser_launcher_rev': 'e5fc5d488eb5038bfec2a6690c72ab8dd353e101',
'dart_clock_rev': '7956d60042f4ea979c4554d43eeb57d087627869',
'dart_collection_rev': '887b826b50f48d6a9cd2c0684aa353e8e3a0fad0',
'dart_core_rev': '3a3ed8e36626b0c72b6edd152fff68d33997b236',
'dart_devtools_rev': 'dcef4f6efe986f110f55dbbe7f3731802e86690a',
'dart_http_rev': '5e2281edd25f9addbf26242a0658d8f2dfa1134b',
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
Expand Down Expand Up @@ -152,8 +153,6 @@ vars = {
"upstream_abseil-cpp": "https://github.com/abseil/abseil-cpp.git",
"upstream_angle": "https://github.com/google/angle.git",
"upstream_archive": "https://github.com/brendan-duncan/archive.git",
"upstream_args": "https://github.com/dart-lang/args.git",
"upstream_async": "https://github.com/dart-lang/async.git",
"upstream_bazel_worker": "https://github.com/dart-lang/bazel_worker.git",
"upstream_benchmark": "https://github.com/google/benchmark.git",
"upstream_boolean_selector": "https://github.com/dart-lang/boolean_selector.git",
Expand All @@ -165,14 +164,11 @@ vars = {
"upstream_cli_util": "https://github.com/dart-lang/cli_util.git",
"upstream_clock": "https://github.com/dart-lang/clock.git",
"upstream_collection": "https://github.com/dart-lang/collection.git",
"upstream_convert": "https://github.com/dart-lang/convert.git",
"upstream_crypto": "https://github.com/dart-lang/crypto.git",
"upstream_csslib": "https://github.com/dart-lang/csslib.git",
"upstream_dart_style": "https://github.com/dart-lang/dart_style.git",
"upstream_dartdoc": "https://github.com/dart-lang/dartdoc.git",
"upstream_equatable": "https://github.com/felangel/equatable.git",
"upstream_ffi": "https://github.com/dart-lang/ffi.git",
"upstream_fixnum": "https://github.com/dart-lang/fixnum.git",
"upstream_flatbuffers": "https://github.com/google/flatbuffers.git",
"upstream_freetype2": "https://gitlab.freedesktop.org/freetype/freetype.git",
"upstream_gcloud": "https://github.com/dart-lang/gcloud.git",
Expand All @@ -199,15 +195,12 @@ vars = {
"upstream_libtess2": "https://github.com/memononen/libtess2.git",
"upstream_libwebp": "https://chromium.googlesource.com/webm/libwebp.git",
"upstream_leak_tracker": "https://github.com/dart-lang/leak_tracker.git",
"upstream_logging": "https://github.com/dart-lang/logging.git",
"upstream_markdown": "https://github.com/dart-lang/markdown.git",
"upstream_matcher": "https://github.com/dart-lang/matcher.git",
"upstream_mockito": "https://github.com/dart-lang/mockito.git",
"upstream_ocmock": "https://github.com/erikdoe/ocmock.git",
"upstream_package_config": "https://github.com/dart-lang/package_config.git",
"upstream_packages": "https://github.com/flutter/packages.git",
"upstream_path": "https://github.com/dart-lang/path.git",
"upstream_platform": "https://github.com/google/platform.dart.git",
"upstream_pool": "https://github.com/dart-lang/pool.git",
"upstream_process_runner": "https://github.com/google/process_runner.git",
"upstream_process": "https://github.com/google/process.dart.git",
Expand All @@ -233,7 +226,6 @@ vars = {
"upstream_term_glyph": "https://github.com/dart-lang/term_glyph.git",
"upstream_test_reflective_loader": "https://github.com/dart-lang/test_reflective_loader.git",
"upstream_test": "https://github.com/dart-lang/test.git",
"upstream_typed_data": "https://github.com/dart-lang/typed_data.git",
"upstream_usage": "https://github.com/dart-lang/usage.git",
"upstream_vector_math": "https://github.com/google/vector_math.dart.git",
"upstream_VulkanMemoryAllocator": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
Expand Down Expand Up @@ -351,12 +343,6 @@ deps = {
'src/flutter/third_party/dart/third_party/devtools':
{'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@09c0fca1785c9df39288a48f767994eed80bed40',

'src/flutter/third_party/dart/third_party/pkg/async':
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 @@ -375,11 +361,8 @@ deps = {
'src/flutter/third_party/dart/third_party/pkg/collection':
Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),

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

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

'src/flutter/third_party/dart/third_party/pkg/csslib':
Var('dart_git') + '/csslib.git@a3700b05bbcc42782e8a7024790dbf019d89c249',
Expand All @@ -390,9 +373,6 @@ deps = {
'src/flutter/third_party/dart/third_party/pkg/dartdoc':
Var('dart_git') + '/dartdoc.git@80c6f18f34b387d4b9ce89ddd2e3049093335f9d',

'src/flutter/third_party/dart/third_party/pkg/fixnum':
Var('dart_git') + '/fixnum.git@83293b8ed86ccd574a94fcf4a2da43f31c1b43e0',

'src/flutter/third_party/dart/third_party/pkg/glob':
Var('dart_git') + '/glob.git@00a9c82d31c01ae88ec9ae4021d842e9b832aa52',

Expand All @@ -414,9 +394,6 @@ deps = {
'src/flutter/third_party/dart/third_party/pkg/leak_tracker':
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',

'src/flutter/third_party/dart/third_party/pkg/logging':
Var('dart_git') + '/logging.git@6fa056098ceca03d399bff64592822b2ae5dee6e',

'src/flutter/third_party/dart/third_party/pkg/markdown':
Var('dart_git') + '/markdown.git@d53feae0760a4f0aae5ffdfb12d8e6acccf14b40',

Expand All @@ -432,9 +409,6 @@ deps = {
'src/flutter/third_party/dart/third_party/pkg/package_config':
Var('dart_git') + '/package_config.git@bafff8e90be25e1985f7e3ee40ea1d22571a93e6',

'src/flutter/third_party/dart/third_party/pkg/path':
Var('dart_git') + '/path.git@e969f42ed112dd702a9453beb9df6c12ae2d3805',

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

Expand Down Expand Up @@ -483,9 +457,6 @@ deps = {
'src/flutter/third_party/dart/third_party/pkg/tools':
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@6abfafdcf661cd8a814619d7e2a3e99edb3a3862',

'src/flutter/third_party/dart/third_party/pkg/watcher':
Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),

Expand Down Expand Up @@ -658,17 +629,17 @@ deps = {
'src/flutter/third_party/pyyaml':
Var('flutter_git') + '/third_party/pyyaml.git' + '@' + '03c67afd452cdff45b41bfe65e19a2fb5b80a0e8',

'src/flutter/third_party/swiftshader':
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f',
'src/flutter/third_party/swiftshader':
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f',

'src/flutter/third_party/angle':
Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',
'src/flutter/third_party/angle':
Var('chromium_git') + '/angle/angle.git' + '@' + '6a09e41ce6ea8c93524faae1a925eb01562f53b1',

'src/flutter/third_party/vulkan_memory_allocator':
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',
'src/flutter/third_party/vulkan_memory_allocator':
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + '7de5cc00de50e71a3aab22dea52fbb7ff4efceb6',

'src/flutter/third_party/abseil-cpp':
Var('flutter_git') + '/third_party/abseil-cpp.git' + '@' + 'ff6504dc527b25fef0f3c531e7dba0ed6b69c162',
'src/flutter/third_party/abseil-cpp':
Var('flutter_git') + '/third_party/abseil-cpp.git' + '@' + 'ff6504dc527b25fef0f3c531e7dba0ed6b69c162',

# Dart packages
'src/flutter/third_party/pkg/archive':
Expand All @@ -695,9 +666,6 @@ deps = {
'src/flutter/third_party/pkg/node_preamble':
Var('flutter_git') + '/third_party/node_preamble.dart.git' + '@' + '47245865175929ec452d8058e563c267b64c3d64', # 2.0.2

'src/flutter/third_party/pkg/platform':
Var('dart_git') + '/platform.dart' + '@' + '1ffad63428bbd1b3ecaa15926bacfb724023648c', # 3.1.0

'src/flutter/third_party/pkg/process':
Var('dart_git') + '/process.dart' + '@' + '0c9aeac86dcc4e3a6cf760b76fed507107e244d5', # 4.2.1

Expand Down
1 change: 0 additions & 1 deletion ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -2584,7 +2584,6 @@
../../../flutter/third_party/pkg/node_preamble/example
../../../flutter/third_party/pkg/node_preamble/package.json
../../../flutter/third_party/pkg/node_preamble/pubspec.yaml
../../../flutter/third_party/pkg/platform
../../../flutter/third_party/pkg/process
../../../flutter/third_party/pkg/process_runner
../../../flutter/third_party/pkg/vector_math
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: e2ff885216f18058fdca914a1cc4149c
Signature: 08cd2e281007e92182d3d540ff50e0ad

18 changes: 9 additions & 9 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,21 +174,21 @@ dependency_overrides:
archive:
path: ./third_party/pkg/archive
args:
path: ./third_party/dart/third_party/pkg/args
path: ./third_party/dart/third_party/pkg/core/pkgs/args
async:
path: ./third_party/dart/third_party/pkg/async
path: ./third_party/dart/third_party/pkg/core/pkgs/async
async_helper:
path: ./third_party/dart/pkg/async_helper
boolean_selector:
path: ./third_party/dart/third_party/pkg/boolean_selector
collection:
path: ./third_party/dart/third_party/pkg/collection
convert:
path: ./third_party/dart/third_party/pkg/convert
path: ./third_party/dart/third_party/pkg/core/pkgs/convert
coverage:
path: ./third_party/pkg/coverage
crypto:
path: ./third_party/dart/third_party/pkg/crypto
path: ./third_party/dart/third_party/pkg/core/pkgs/crypto
equatable:
path: ./third_party/pkg/equatable
expect:
Expand All @@ -198,7 +198,7 @@ dependency_overrides:
ffi:
path: ./third_party/dart/third_party/pkg/native/pkgs/ffi
fixnum:
path: ./third_party/dart/third_party/pkg/fixnum
path: ./third_party/dart/third_party/pkg/core/pkgs/fixnum
frontend_server_client:
path: ./third_party/dart/third_party/pkg/webdev/frontend_server_client
gcloud:
Expand All @@ -222,7 +222,7 @@ dependency_overrides:
kernel:
path: ./third_party/dart/pkg/kernel
logging:
path: ./third_party/dart/third_party/pkg/logging
path: ./third_party/dart/third_party/pkg/core/pkgs/logging
macros:
path: ./third_party/dart/pkg/macros
matcher:
Expand All @@ -238,9 +238,9 @@ dependency_overrides:
package_config:
path: ./third_party/dart/third_party/pkg/package_config
path:
path: ./third_party/dart/third_party/pkg/path
path: ./third_party/dart/third_party/pkg/core/pkgs/path
platform:
path: ./third_party/pkg/platform
path: ./third_party/dart/third_party/pkg/core/pkgs/platform
pool:
path: ./third_party/dart/third_party/pkg/pool
process:
Expand Down Expand Up @@ -284,7 +284,7 @@ dependency_overrides:
test_core:
path: ./third_party/dart/third_party/pkg/test/pkgs/test_core
typed_data:
path: ./third_party/dart/third_party/pkg/typed_data
path: ./third_party/dart/third_party/pkg/core/pkgs/typed_data
vector_math:
path: ./third_party/pkg/vector_math
vm_service:
Expand Down
6 changes: 3 additions & 3 deletions shell/platform/fuchsia/dart/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ dart_library("meta") {
}

dart_library("args") {
package_root = "$dart_src/third_party/pkg/args"
package_root = "$dart_src/third_party/pkg/core/pkgs/args"
package_name = "args"

language_version = "2.17"
Expand Down Expand Up @@ -167,7 +167,7 @@ dart_library("collection") {
}

dart_library("logging") {
package_root = "$dart_src/third_party/pkg/logging"
package_root = "$dart_src/third_party/pkg/core/pkgs/logging"
package_name = "logging"

pubspec = "$package_root/pubspec.yaml"
Expand All @@ -183,7 +183,7 @@ dart_library("logging") {
}

dart_library("path") {
package_root = "$dart_src/third_party/pkg/path"
package_root = "$dart_src/third_party/pkg/core/pkgs/path"
package_name = "path"

pubspec = "$package_root/pubspec.yaml"
Expand Down
1 change: 0 additions & 1 deletion tools/licenses/lib/paths.dart
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ final Set<String> skippedPaths = <String>{
r'flutter/third_party/pkg/flutter_packages',
r'flutter/third_party/pkg/gcloud',
r'flutter/third_party/pkg/googleapis',
r'flutter/third_party/pkg/platform',
r'flutter/third_party/pkg/process',
r'flutter/third_party/pkg/process_runner',
r'flutter/third_party/pkg/vector_math',
Expand Down
14 changes: 8 additions & 6 deletions web_sdk/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ environment:
sdk: '>=3.6.0-0 <4.0.0'

dependencies:
args: 2.3.1
args: any # see dependency_overrides
path: any # see dependency_overrides

dev_dependencies:
Expand All @@ -22,14 +22,16 @@ dependency_overrides: # Must include all transitive dependencies from the "any"
path: ../third_party/dart/pkg/_macros
analyzer:
path: ../third_party/dart/pkg/analyzer
args:
path: ../third_party/dart/third_party/pkg/core/pkgs/args
async:
path: ../third_party/dart/third_party/pkg/async
path: ../third_party/dart/third_party/pkg/core/pkgs/async
collection:
path: ../third_party/dart/third_party/pkg/collection
convert:
path: ../third_party/dart/third_party/pkg/convert
path: ../third_party/dart/third_party/pkg/core/pkgs/convert
crypto:
path: ../third_party/dart/third_party/pkg/crypto
path: ../third_party/dart/third_party/pkg/core/pkgs/crypto
dart_internal:
path: ../third_party/dart/pkg/dart_internal
file:
Expand All @@ -43,7 +45,7 @@ dependency_overrides: # Must include all transitive dependencies from the "any"
package_config:
path: ../third_party/dart/third_party/pkg/package_config
path:
path: ../third_party/dart/third_party/pkg/path
path: ../third_party/dart/third_party/pkg/core/pkgs/path
pub_semver:
path: ../third_party/dart/third_party/pkg/pub_semver
source_span:
Expand All @@ -53,7 +55,7 @@ dependency_overrides: # Must include all transitive dependencies from the "any"
term_glyph:
path: ../third_party/dart/third_party/pkg/term_glyph
typed_data:
path: ../third_party/dart/third_party/pkg/typed_data
path: ../third_party/dart/third_party/pkg/core/pkgs/typed_data
watcher:
path: ../third_party/dart/third_party/pkg/watcher
yaml:
Expand Down

0 comments on commit 6620f42

Please sign in to comment.