From ad5e1fe300b7bfe618f9c2f4a394f499eac6859c Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Tue, 7 Jan 2025 13:49:48 -0800 Subject: [PATCH] [deps] remove references to archived repos (#161248) - remove references to archived repos; test_reflective_loader, sse, source_span, source_maps, pub_semver, pool and package_config These have moved into the dart-lang/tools monorepo. *List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.* - done as part of https://github.com/dart-lang/sdk/issues/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], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md --- DEPS | 27 ------------------------- engine/src/flutter/pubspec.yaml | 10 ++++----- engine/src/flutter/web_sdk/pubspec.yaml | 6 +++--- 3 files changed, 8 insertions(+), 35 deletions(-) diff --git a/DEPS b/DEPS index 6d2ccddf10..dddb18d7ac 100644 --- a/DEPS +++ b/DEPS @@ -182,9 +182,7 @@ vars = { "upstream_markdown": "https://github.com/dart-lang/markdown.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_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", "upstream_protobuf": "https://github.com/google/protobuf.dart.git", @@ -197,17 +195,13 @@ vars = { "upstream_shaderc": "https://github.com/google/shaderc.git", "upstream_shelf": "https://github.com/dart-lang/shelf.git", "upstream_skia": "https://skia.googlesource.com/skia.git", - "upstream_source_maps": "https://github.com/dart-lang/source_maps.git", - "upstream_source_span": "https://github.com/dart-lang/source_span.git", "upstream_sqlite": "https://github.com/sqlite/sqlite.git", - "upstream_sse": "https://github.com/dart-lang/sse.git", "upstream_stack_trace": "https://github.com/dart-lang/stack_trace.git", "upstream_stream_channel": "https://github.com/dart-lang/stream_channel.git", "upstream_string_scanner": "https://github.com/dart-lang/string_scanner.git", "upstream_SwiftShader": "https://swiftshader.googlesource.com/SwiftShader.git", "upstream_tar": "https://github.com/simolus3/tar.git", "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_usage": "https://github.com/dart-lang/usage.git", "upstream_vector_math": "https://github.com/google/vector_math.dart.git", @@ -348,33 +342,15 @@ deps = { 'engine/src/flutter/third_party/dart/third_party/pkg/native': Var('dart_git') + '/native.git@4d81ce6c5e17164ef63d8a3f5144e5def0702207', - 'engine/src/flutter/third_party/dart/third_party/pkg/package_config': - Var('dart_git') + '/package_config.git@76f2f6c245451da1fa24d7bbb00251b909e729a5', - - 'engine/src/flutter/third_party/dart/third_party/pkg/pool': - Var('dart_git') + '/pool.git@f85209d83cb0aa3c5612ed80de32df51ba580abd', - 'engine/src/flutter/third_party/dart/third_party/pkg/protobuf': Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'), 'engine/src/flutter/third_party/dart/third_party/pkg/pub': Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'), - 'engine/src/flutter/third_party/dart/third_party/pkg/pub_semver': - Var('dart_git') + '/pub_semver.git@8e9fcb9d3f89f06022387f906da4d380688f935c', - 'engine/src/flutter/third_party/dart/third_party/pkg/shelf': Var('dart_git') + '/shelf.git@2b5b683e78f5cc84e479a43297fd7b5489d7db02', - 'engine/src/flutter/third_party/dart/third_party/pkg/source_maps': - Var('dart_git') + '/source_maps.git@198d32bbde2f5736c04dfbab306a17096fd1648b', - - 'engine/src/flutter/third_party/dart/third_party/pkg/source_span': - Var('dart_git') + '/source_span.git@22a243eb50d926935a8a1300a49af6d2988c3ae6', - - 'engine/src/flutter/third_party/dart/third_party/pkg/sse': - Var('dart_git') + '/sse.git@b97dc3ad9a58a454dc5ffe5b3ec814dadc389e32', - 'engine/src/flutter/third_party/dart/third_party/pkg/stack_trace': Var('dart_git') + '/stack_trace.git@b660cfa444d46bcceb3a0eacbd6a2a7829da11de', @@ -393,9 +369,6 @@ deps = { 'engine/src/flutter/third_party/dart/third_party/pkg/test': Var('dart_git') + '/test.git@dc0f8ea4d09aabb0fed16daea3d4653c8f967b02', - 'engine/src/flutter/third_party/dart/third_party/pkg/test_reflective_loader': - Var('dart_git') + '/test_reflective_loader.git@faade6299d1823f0d062eb5e98f3b440ddcea7c6', - 'engine/src/flutter/third_party/dart/third_party/pkg/tools': Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'), diff --git a/engine/src/flutter/pubspec.yaml b/engine/src/flutter/pubspec.yaml index 4e0d19c33e..0a64eee9f8 100644 --- a/engine/src/flutter/pubspec.yaml +++ b/engine/src/flutter/pubspec.yaml @@ -236,13 +236,13 @@ dependency_overrides: node_preamble: path: ./third_party/pkg/node_preamble package_config: - path: ./third_party/dart/third_party/pkg/package_config + path: ./third_party/dart/third_party/pkg/tools/pkgs/package_config path: path: ./third_party/dart/third_party/pkg/core/pkgs/path platform: path: ./third_party/dart/third_party/pkg/core/pkgs/platform pool: - path: ./third_party/dart/third_party/pkg/pool + path: ./third_party/dart/third_party/pkg/tools/pkgs/pool process: path: ./third_party/pkg/process process_runner: @@ -250,7 +250,7 @@ dependency_overrides: protobuf: path: ./third_party/dart/third_party/pkg/protobuf/protobuf pub_semver: - path: ./third_party/dart/third_party/pkg/pub_semver + path: ./third_party/dart/third_party/pkg/tools/pkgs/pub_semver shelf: path: ./third_party/dart/third_party/pkg/shelf/pkgs/shelf shelf_packages_handler: @@ -266,9 +266,9 @@ dependency_overrides: source_map_stack_trace: path: ./third_party/dart/third_party/pkg/tools/pkgs/source_map_stack_trace source_maps: - path: ./third_party/dart/third_party/pkg/source_maps + path: ./third_party/dart/third_party/pkg/tools/pkgs/source_maps source_span: - path: ./third_party/dart/third_party/pkg/source_span + path: ./third_party/dart/third_party/pkg/tools/pkgs/source_span stack_trace: path: ./third_party/dart/third_party/pkg/stack_trace stream_channel: diff --git a/engine/src/flutter/web_sdk/pubspec.yaml b/engine/src/flutter/web_sdk/pubspec.yaml index 2d5ef8e63c..cae3323f31 100644 --- a/engine/src/flutter/web_sdk/pubspec.yaml +++ b/engine/src/flutter/web_sdk/pubspec.yaml @@ -43,13 +43,13 @@ dependency_overrides: # Must include all transitive dependencies from the "any" meta: path: ../third_party/dart/pkg/meta package_config: - path: ../third_party/dart/third_party/pkg/package_config + path: ../third_party/dart/third_party/pkg/tools/pkgs/package_config path: path: ../third_party/dart/third_party/pkg/core/pkgs/path pub_semver: - path: ../third_party/dart/third_party/pkg/pub_semver + path: ../third_party/dart/third_party/pkg/tools/pkgs/pub_semver source_span: - path: ../third_party/dart/third_party/pkg/source_span + path: ../third_party/dart/third_party/pkg/tools/pkgs/source_span string_scanner: path: ../third_party/dart/third_party/pkg/string_scanner term_glyph: