Skip to content

Commit 310dff2

Browse files
devoncarewmaheshj01
authored andcommitted
[deps] remove no-longer-used repo deps (flutter#161605)
Remove older repo references; remove older references to `yaml_edit`, `yaml`, `watcher`, `term_glyph`, `string_scanner`, `stream_channel`, `stack_trace`, and `watcher`. Done as part of 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], 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]. <!-- Links --> [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
1 parent d353e28 commit 310dff2

File tree

3 files changed

+10
-40
lines changed

3 files changed

+10
-40
lines changed

DEPS

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,9 @@ vars = {
7171
'dart_protobuf_rev': 'b7dd58cdbd879beee4c3fbf8ee80fce8e97bad26',
7272
'dart_pub_rev': '58de642dc1d07601f6eb2b4ecd94555c0210106b',
7373
'dart_tools_rev': 'b412ba4550bb634caf3c1064b7ebb671cd5e9247',
74-
'dart_watcher_rev': '7f3b3a3ea49ba7e21fff240ce8ee616d62d32956',
7574
'dart_web_rev': 'af5de5e8548060c0795713ee7129ba6d5ff9f1b2',
7675
'dart_webdev_rev': 'e72f365a4408dce73bc023e624adc6a9a72dd7a2',
7776
'dart_webkit_inspection_protocol_rev': 'effa75205516757795683d527c3dea9546eb0c32',
78-
'dart_yaml_edit_rev': 'fbdc70acc164af187772e013a2e1364cd05b88dc',
7977

8078
'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
8179

@@ -196,23 +194,16 @@ vars = {
196194
"upstream_shelf": "https://github.com/dart-lang/shelf.git",
197195
"upstream_skia": "https://skia.googlesource.com/skia.git",
198196
"upstream_sqlite": "https://github.com/sqlite/sqlite.git",
199-
"upstream_stack_trace": "https://github.com/dart-lang/stack_trace.git",
200-
"upstream_stream_channel": "https://github.com/dart-lang/stream_channel.git",
201-
"upstream_string_scanner": "https://github.com/dart-lang/string_scanner.git",
202197
"upstream_SwiftShader": "https://swiftshader.googlesource.com/SwiftShader.git",
203198
"upstream_tar": "https://github.com/simolus3/tar.git",
204-
"upstream_term_glyph": "https://github.com/dart-lang/term_glyph.git",
205199
"upstream_test": "https://github.com/dart-lang/test.git",
206200
"upstream_usage": "https://github.com/dart-lang/usage.git",
207201
"upstream_vector_math": "https://github.com/google/vector_math.dart.git",
208202
"upstream_VulkanMemoryAllocator": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
209-
"upstream_watcher": "https://github.com/dart-lang/watcher.git",
210203
"upstream_web_socket_channel": "https://github.com/dart-lang/web_socket_channel.git",
211204
"upstream_webdev": "https://github.com/dart-lang/webdev.git",
212205
"upstream_webkit_inspection_protocol": "https://github.com/google/webkit_inspection_protocol.dart.git",
213206
"upstream_wuffs-mirror-release-c": "https://github.com/google/wuffs-mirror-release-c.git",
214-
"upstream_yaml_edit": "https://github.com/dart-lang/yaml_edit.git",
215-
"upstream_yaml": "https://github.com/dart-lang/yaml.git",
216207
"upstream_yapf": "https://github.com/google/yapf.git",
217208
"upstream_zlib": "https://github.com/madler/zlib.git",
218209

@@ -351,30 +342,15 @@ deps = {
351342
'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
352343
Var('dart_git') + '/shelf.git@2b5b683e78f5cc84e479a43297fd7b5489d7db02',
353344

354-
'engine/src/flutter/third_party/dart/third_party/pkg/stack_trace':
355-
Var('dart_git') + '/stack_trace.git@5fe4cfea7f0d8e67b7d5738d2e1c64a18b5ba450',
356-
357-
'engine/src/flutter/third_party/dart/third_party/pkg/stream_channel':
358-
Var('dart_git') + '/stream_channel.git@31a3aba8a78a78b266fbf7474f19cd4ba9ca562e',
359-
360-
'engine/src/flutter/third_party/dart/third_party/pkg/string_scanner':
361-
Var('dart_git') + '/string_scanner.git@69212690d491603a511904a7a84cd502f34bf7a9',
362-
363345
'engine/src/flutter/third_party/dart/third_party/pkg/tar':
364346
Var('dart_git') + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a',
365347

366-
'engine/src/flutter/third_party/dart/third_party/pkg/term_glyph':
367-
Var('dart_git') + '/term_glyph.git@52677db71a2c6b6d0018ebbe5ed7552dbae1248f',
368-
369348
'engine/src/flutter/third_party/dart/third_party/pkg/test':
370349
Var('dart_git') + '/test.git@f364fc8291d668d85c702a5b9f9a4f2e5c1ade0e',
371350

372351
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
373352
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
374353

375-
'engine/src/flutter/third_party/dart/third_party/pkg/watcher':
376-
Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
377-
378354
'engine/src/flutter/third_party/dart/third_party/pkg/web':
379355
Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
380356

@@ -387,12 +363,6 @@ deps = {
387363
'engine/src/flutter/third_party/dart/third_party/pkg/webkit_inspection_protocol':
388364
Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
389365

390-
'engine/src/flutter/third_party/dart/third_party/pkg/yaml':
391-
Var('dart_git') + '/yaml.git@0406507fb719b0c8787896475734747fa35f2b78',
392-
393-
'engine/src/flutter/third_party/dart/third_party/pkg/yaml_edit':
394-
Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
395-
396366
'engine/src/flutter/third_party/dart/tools/sdks/dart-sdk':
397367
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:f863f0b43625eb04539a34d7cc25029ba80dd522'}]},
398368

engine/src/flutter/pubspec.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,13 +270,13 @@ dependency_overrides:
270270
source_span:
271271
path: ./third_party/dart/third_party/pkg/tools/pkgs/source_span
272272
stack_trace:
273-
path: ./third_party/dart/third_party/pkg/stack_trace
273+
path: ./third_party/dart/third_party/pkg/tools/pkgs/stack_trace
274274
stream_channel:
275-
path: ./third_party/dart/third_party/pkg/stream_channel
275+
path: ./third_party/dart/third_party/pkg/tools/pkgs/stream_channel
276276
string_scanner:
277-
path: ./third_party/dart/third_party/pkg/string_scanner
277+
path: ./third_party/dart/third_party/pkg/tools/pkgs/string_scanner
278278
term_glyph:
279-
path: ./third_party/dart/third_party/pkg/term_glyph
279+
path: ./third_party/dart/third_party/pkg/tools/pkgs/term_glyph
280280
test:
281281
path: ./third_party/dart/third_party/pkg/test/pkgs/test
282282
test_api:
@@ -292,7 +292,7 @@ dependency_overrides:
292292
vm_service_protos:
293293
path: ./third_party/dart/pkg/vm_service_protos
294294
watcher:
295-
path: ./third_party/dart/third_party/pkg/watcher
295+
path: ./third_party/dart/third_party/pkg/tools/pkgs/watcher
296296
web:
297297
path: ./third_party/dart/third_party/pkg/web/web
298298
web_socket:
@@ -302,4 +302,4 @@ dependency_overrides:
302302
webkit_inspection_protocol:
303303
path: ./third_party/dart/third_party/pkg/webkit_inspection_protocol
304304
yaml:
305-
path: ./third_party/dart/third_party/pkg/yaml
305+
path: ./third_party/dart/third_party/pkg/tools/pkgs/yaml

engine/src/flutter/web_sdk/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ dependency_overrides: # Must include all transitive dependencies from the "any"
5151
source_span:
5252
path: ../third_party/dart/third_party/pkg/tools/pkgs/source_span
5353
string_scanner:
54-
path: ../third_party/dart/third_party/pkg/string_scanner
54+
path: ../third_party/dart/third_party/pkg/tools/pkgs/string_scanner
5555
term_glyph:
56-
path: ../third_party/dart/third_party/pkg/term_glyph
56+
path: ../third_party/dart/third_party/pkg/tools/pkgs/term_glyph
5757
typed_data:
5858
path: ../third_party/dart/third_party/pkg/core/pkgs/typed_data
5959
watcher:
60-
path: ../third_party/dart/third_party/pkg/watcher
60+
path: ../third_party/dart/third_party/pkg/tools/pkgs/watcher
6161
yaml:
62-
path: ../third_party/dart/third_party/pkg/yaml
62+
path: ../third_party/dart/third_party/pkg/tools/pkgs/yaml

0 commit comments

Comments
 (0)