From 2bf32d855e08357097a0152f4c45bf63f906b240 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 24 Feb 2025 12:13:03 -0800 Subject: [PATCH] [deps] update dep references from older repos to newer (current SOT) repos (#163891) Update dep references from older repos to newer (current SOT) repos: - package:markdown is now part of the dart-lang/tools monorepo - package:glob is now part of the dart-lang/tools monorepo - package:web_socket_channel is now in dart-lang/http - package:intl moved (quite a while ago) to the dart-lang/i18n monorepo - package:gcloud moved (a while ago) to dart-lang/labs I didn't have to update any references to package:intl as part of this; I suspect that means that its not actually used here. I was not able to update package:gcloud to the most recent commit; I had to stop short of that because the package is now referencing package:retry - in google/dart-neats - and there's no mirror for that. Generally, it would be useful to have a process to update older references here and / or garbage collect the dep'd in repos. Done as the last bit 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 | 18 +++--------------- engine/src/flutter/pubspec.yaml | 4 ++-- engine/src/flutter/web_sdk/pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/DEPS b/DEPS index c5df14550a..dfef46768a 100644 --- a/DEPS +++ b/DEPS @@ -65,6 +65,7 @@ vars = { 'dart_core_rev': '0b2bd3fcd7f3e082f4cc9b14c19ffa93894b85ae', 'dart_devtools_rev': 'b38abb81337b10c4b675d418e50f82a5fe6a894d', 'dart_http_rev': '900da9fe7d576caa4882053cf26d3a70bd3106e0', + 'dart_i18n_rev': '06a664f7beaab1f8eaf82a60b722982c03c8657c', 'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb', 'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b', 'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10', @@ -158,14 +159,12 @@ vars = { "upstream_freetype2": "https://gitlab.freedesktop.org/freetype/freetype.git", "upstream_gcloud": "https://github.com/dart-lang/gcloud.git", "upstream_glfw": "https://github.com/glfw/glfw.git", - "upstream_glob": "https://github.com/dart-lang/glob.git", "upstream_googleapis": "https://github.com/google/googleapis.dart.git", "upstream_googletest": "https://github.com/google/googletest.git", "upstream_gtest-parallel": "https://github.com/google/gtest-parallel.git", "upstream_harfbuzz": "https://github.com/harfbuzz/harfbuzz.git", "upstream_http": "https://github.com/dart-lang/http.git", "upstream_icu": "https://github.com/unicode-org/icu.git", - "upstream_intl": "https://github.com/dart-lang/intl.git", "upstream_imgui": "https://github.com/ocornut/imgui.git", "upstream_inja": "https://github.com/pantor/inja.git", "upstream_json": "https://github.com/nlohmann/json.git", @@ -177,7 +176,6 @@ 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_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_packages": "https://github.com/flutter/packages.git", @@ -200,7 +198,6 @@ vars = { "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", - "upstream_web_socket_channel": "https://github.com/dart-lang/web_socket_channel.git", "upstream_webdev": "https://github.com/dart-lang/webdev.git", "upstream_webkit_inspection_protocol": "https://github.com/google/webkit_inspection_protocol.dart.git", "upstream_wuffs-mirror-release-c": "https://github.com/google/wuffs-mirror-release-c.git", @@ -315,21 +312,15 @@ deps = { 'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc': Var('dart_git') + '/dartdoc.git@f0d2276e57c96717e625964ea0385a30f2237e62', - 'engine/src/flutter/third_party/dart/third_party/pkg/glob': - Var('dart_git') + '/glob.git@043796be996190473b397fa2fecfa34bb91376fb', - 'engine/src/flutter/third_party/dart/third_party/pkg/http': Var('dart_git') + '/http.git' + '@' + Var('dart_http_rev'), - 'engine/src/flutter/third_party/dart/third_party/pkg/intl': - Var('dart_git') + '/intl.git@5d65e3808ce40e6282e40881492607df4e35669f', + 'engine/src/flutter/third_party/dart/third_party/pkg/i18n': + Var('dart_git') + '/i18n.git' + '@' + Var('dart_i18n_rev'), 'engine/src/flutter/third_party/dart/third_party/pkg/leak_tracker': Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c', - 'engine/src/flutter/third_party/dart/third_party/pkg/markdown': - Var('dart_git') + '/markdown.git@62f78c64d963ba6f73bd70ed65630dc934a264e6', - 'engine/src/flutter/third_party/dart/third_party/pkg/native': Var('dart_git') + '/native.git@c817a5e41220de370cbea6e6445e63cdc7087544', @@ -354,9 +345,6 @@ deps = { 'engine/src/flutter/third_party/dart/third_party/pkg/web': Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'), - 'engine/src/flutter/third_party/dart/third_party/pkg/web_socket_channel': - Var('dart_git') + '/web_socket_channel.git@f335e52affa5c70a725401394bf265fc4384e62f', - 'engine/src/flutter/third_party/dart/third_party/pkg/webdev': Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'), diff --git a/engine/src/flutter/pubspec.yaml b/engine/src/flutter/pubspec.yaml index da48e95322..de7ca12c0c 100644 --- a/engine/src/flutter/pubspec.yaml +++ b/engine/src/flutter/pubspec.yaml @@ -204,7 +204,7 @@ dependency_overrides: gcloud: path: ./third_party/pkg/gcloud glob: - path: ./third_party/dart/third_party/pkg/glob + path: ./third_party/dart/third_party/pkg/tools/pkgs/glob googleapis: path: ./third_party/pkg/googleapis/generated/googleapis googleapis_auth: @@ -298,7 +298,7 @@ dependency_overrides: web_socket: path: ./third_party/dart/third_party/pkg/http/pkgs/web_socket web_socket_channel: - path: ./third_party/dart/third_party/pkg/web_socket_channel + path: ./third_party/dart/third_party/pkg/http/pkgs/web_socket_channel webkit_inspection_protocol: path: ./third_party/dart/third_party/pkg/webkit_inspection_protocol yaml: diff --git a/engine/src/flutter/web_sdk/pubspec.yaml b/engine/src/flutter/web_sdk/pubspec.yaml index 8b067e59e7..fb1def8b2a 100644 --- a/engine/src/flutter/web_sdk/pubspec.yaml +++ b/engine/src/flutter/web_sdk/pubspec.yaml @@ -37,7 +37,7 @@ dependency_overrides: # Must include all transitive dependencies from the "any" file: path: ../third_party/dart/third_party/pkg/tools/pkgs/file glob: - path: ../third_party/dart/third_party/pkg/glob + path: ../third_party/dart/third_party/pkg/tools/pkgs/glob macros: path: ../third_party/dart/pkg/macros meta: