From 4eca2005c984922c42eabb792491aaa00d80d00d Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 4 Sep 2024 06:56:37 +0000 Subject: [PATCH] Switch to new locations of mime and source_map_stack_trace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I241ddb82a36daaf299291fd59598e5c8f1893984 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/382385 Reviewed-by: Alexander Aprelev Reviewed-by: Phil Quitslund Commit-Queue: Moritz Sümmermann --- DEPS | 9 +-------- pkg/analysis_server/pubspec.yaml | 4 ++-- pkg/analysis_server_plugin/pubspec.yaml | 4 ++-- pkg/server_plugin/pubspec.yaml | 4 ++-- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/DEPS b/DEPS index e075762b23c..daf4cbc3e97 100644 --- a/DEPS +++ b/DEPS @@ -162,7 +162,6 @@ vars = { "markdown_rev": "f6eaea38146d8901756418c4e7123eb7bd77249e", "matcher_rev": "d6d573d0f8d65b36550ce62aad3ce6b5e987b642", "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e", - "mime_rev": "11fec7d6df509a4efd554051cc27e3bf82df9c96", "mockito_rev": "eb4d1daa20c105c94ac29689c1975f0850fa18f2", "native_rev": "5e9e4795d1faa39efeb92ae42fc0fa353778308f", # dart-native-interop-team@ is rolling breaking changes manually while the assets features are in experimental. "package_config_rev": "76934c2ca25922ec72909bbff7dfbddaf0d02bd9", @@ -172,7 +171,6 @@ vars = { "pub_rev": "31fa75baa5872e7f094a554c0ec7741742889530", # disable tools/rev_sdk_deps.dart "pub_semver_rev": "d9e5ee68a350fbf4319bd4dfcb895fc016337d3a", "shelf_rev": "9f2dffecbe8f219146a077e401758602752d486a", - "source_map_stack_trace_rev": "741b6ceb4b6cdb8ff620664337d7ecc63ca52cc1", "source_maps_rev": "5f82c613664ade03c7a6d0e6c59687c69dec894b", "source_span_rev": "f81cd4a2df630a97264fb4015fb93944b5b98b11", "sse_rev": "af2c5c572a8da6d2f7551b80d75121f2a38a4c79", @@ -186,7 +184,7 @@ vars = { "test_descriptor_rev": "90743bc16bc00526a1b9a64f813614be9b2479d9", "test_process_rev": "6223572ca16d7585d5f08d9281de6a5734e45150", "test_reflective_loader_rev": "6e648863b39aab8d0204e769d25805eea9db0ac4", - "tools_rev": "5b15f8b60bf950a2f06dad3258dee61c153fdb44", + "tools_rev": "b98c535537101eff0484ba279bd4090a5b9ac2ad", "typed_data_rev": "365468a74251c930a463daf5b8f13227e269111a", "vector_math_rev": "2cfbe2c115a57b368ccbc3c89ebd38a06764d3d1", "watcher_rev": "0484625589d8512b36a7ad898a6cc6351d24c556", @@ -458,8 +456,6 @@ deps = { "@" + Var("material_color_utilities_rev"), "condition": "checkout_flute", }, - Var("dart_root") + "/third_party/pkg/mime": - Var("dart_git") + "mime.git" + "@" + Var("mime_rev"), Var("dart_root") + "/third_party/pkg/mockito": Var("dart_git") + "mockito.git" + "@" + Var("mockito_rev"), Var("dart_root") + "/third_party/pkg/native": @@ -483,9 +479,6 @@ deps = { Var("dart_git") + "source_maps.git" + "@" + Var("source_maps_rev"), Var("dart_root") + "/third_party/pkg/source_span": Var("dart_git") + "source_span.git" + "@" + Var("source_span_rev"), - Var("dart_root") + "/third_party/pkg/source_map_stack_trace": - Var("dart_git") + "source_map_stack_trace.git" + - "@" + Var("source_map_stack_trace_rev"), Var("dart_root") + "/third_party/pkg/sse": Var("dart_git") + "sse.git" + "@" + Var("sse_rev"), Var("dart_root") + "/third_party/pkg/stack_trace": diff --git a/pkg/analysis_server/pubspec.yaml b/pkg/analysis_server/pubspec.yaml index 295616232c8..b0374096cf3 100644 --- a/pkg/analysis_server/pubspec.yaml +++ b/pkg/analysis_server/pubspec.yaml @@ -108,7 +108,7 @@ dependency_overrides: meta: path: ../meta mime: - path: ../../third_party/pkg/mime + path: ../../third_party/pkg/tools/pkgs/mime package_config: path: ../../third_party/pkg/package_config path: @@ -126,7 +126,7 @@ dependency_overrides: shelf_web_socket: path: ../../third_party/pkg/shelf/pkgs/shelf_web_socket source_map_stack_trace: - path: ../../third_party/pkg/source_map_stack_trace + path: ../../third_party/pkg/tools/pkgs/source_map_stack_trace source_maps: path: ../../third_party/pkg/source_maps source_span: diff --git a/pkg/analysis_server_plugin/pubspec.yaml b/pkg/analysis_server_plugin/pubspec.yaml index b6d715211c1..f6be0367776 100644 --- a/pkg/analysis_server_plugin/pubspec.yaml +++ b/pkg/analysis_server_plugin/pubspec.yaml @@ -76,7 +76,7 @@ dependency_overrides: meta: path: ../meta mime: - path: ../../third_party/pkg/mime + path: ../../third_party/pkg/tools/pkgs/mime package_config: path: ../../third_party/pkg/package_config path: @@ -96,7 +96,7 @@ dependency_overrides: shelf_web_socket: path: ../../third_party/pkg/shelf/pkgs/shelf_web_socket source_map_stack_trace: - path: ../../third_party/pkg/source_map_stack_trace + path: ../../third_party/pkg/tools/pkgs/source_map_stack_trace source_maps: path: ../../third_party/pkg/source_maps source_span: diff --git a/pkg/server_plugin/pubspec.yaml b/pkg/server_plugin/pubspec.yaml index 93526335810..2ce180e5074 100644 --- a/pkg/server_plugin/pubspec.yaml +++ b/pkg/server_plugin/pubspec.yaml @@ -70,7 +70,7 @@ dependency_overrides: meta: path: ../meta mime: - path: ../../third_party/pkg/mime + path: ../../third_party/pkg/tools/pkgs/mime package_config: path: ../../third_party/pkg/package_config path: @@ -88,7 +88,7 @@ dependency_overrides: shelf_web_socket: path: ../../third_party/pkg/shelf/pkgs/shelf_web_socket source_map_stack_trace: - path: ../../third_party/pkg/source_map_stack_trace + path: ../../third_party/pkg/tools/pkgs/source_map_stack_trace source_maps: path: ../../third_party/pkg/source_maps source_span: