Skip to content

Commit

Permalink
Cleanup Dart package dependencies a bit (#47306)
Browse files Browse the repository at this point in the history
Removes package:quiver, and an older second copy of package:file
  • Loading branch information
zanderso authored Oct 25, 2023
1 parent 0913ebd commit e887450
Show file tree
Hide file tree
Showing 15 changed files with 13 additions and 21 deletions.
6 changes: 0 additions & 6 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -644,9 +644,6 @@ deps = {
'src/third_party/pkg/equatable':
Var('github_git') + '/felangel/equatable.git' + '@' + '0ba67c72db8bed75877fc1caafa74112ee0bd921', # 2.0.2

'src/third_party/pkg/file':
Var('dart_git') + '/external/github.com/google/file.dart.git' + '@' + 'b2e31cb6ef40b223701dbfa0b907fe58468484d7', # 6.1.4

'src/third_party/pkg/flutter_packages':
Var('flutter_git') + '/mirrors/packages' + '@' + '25454e63851fe7933f04d025606e68c1eac4fe0f', # various

Expand All @@ -665,9 +662,6 @@ deps = {
'src/third_party/pkg/process_runner':
Var('github_git') + '/google/process_runner.git' + '@' + 'f24c69efdcaf109168f23d381fa281453d2bc9b1', # 4.1.2

'src/third_party/pkg/quiver':
Var('chromium_git') + '/external/github.com/google/quiver-dart' + '@' + '90b92bee895e507d435012356a8b5c5f17eafa52', # 3.2.1

'src/third_party/pkg/vector_math':
Var('dart_git') + '/external/github.com/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0

Expand Down
2 changes: 0 additions & 2 deletions ci/licenses_golden/excluded_files
Original file line number Diff line number Diff line change
Expand Up @@ -2556,14 +2556,12 @@
../../../third_party/perfetto/ui/src/test
../../../third_party/pkg/archive
../../../third_party/pkg/equatable
../../../third_party/pkg/file
../../../third_party/pkg/flutter_packages
../../../third_party/pkg/gcloud
../../../third_party/pkg/googleapis
../../../third_party/pkg/platform
../../../third_party/pkg/process
../../../third_party/pkg/process_runner
../../../third_party/pkg/quiver
../../../third_party/pkg/vector_math
../../../third_party/protobuf
../../../third_party/pyyaml
Expand Down
2 changes: 1 addition & 1 deletion ci/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependency_overrides:
expect:
path: ../../third_party/dart/pkg/expect
file:
path: ../../third_party/pkg/file/packages/file
path: ../../third_party/dart/third_party/pkg/file/packages/file
litetest:
path: ../testing/litetest
meta:
Expand Down
2 changes: 1 addition & 1 deletion impeller/golden_tests_harvester/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependency_overrides:
crypto:
path: ../../../third_party/dart/third_party/pkg/crypto
file:
path: ../../../third_party/pkg/file/packages/file
path: ../../../third_party/dart/third_party/pkg/file/packages/file
meta:
path: ../../../third_party/dart/pkg/meta
path:
Expand Down
2 changes: 1 addition & 1 deletion testing/scenario_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependency_overrides:
crypto:
path: ../../../third_party/dart/third_party/pkg/crypto
file:
path: ../../../third_party/pkg/file/packages/file
path: ../../../third_party/dart/third_party/pkg/file/packages/file
meta:
path: ../../../third_party/dart/pkg/meta
path:
Expand Down
2 changes: 1 addition & 1 deletion testing/skia_gold_client/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependency_overrides:
crypto:
path: ../../../third_party/dart/third_party/pkg/crypto
file:
path: ../../../third_party/pkg/file/packages/file
path: ../../../third_party/dart/third_party/pkg/file/packages/file
meta:
path: ../../../third_party/dart/pkg/meta
path:
Expand Down
2 changes: 1 addition & 1 deletion tools/android_lint/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependency_overrides:
args:
path: ../../../third_party/dart/third_party/pkg/args
file:
path: ../../../third_party/pkg/file/packages/file
path: ../../../third_party/dart/third_party/pkg/file/packages/file
meta:
path: ../../../third_party/dart/pkg/meta
path:
Expand Down
2 changes: 1 addition & 1 deletion tools/api_check/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ dependency_overrides:
expect:
path: ../../../third_party/dart/pkg/expect
file:
path: ../../../third_party/pkg/file/packages/file
path: ../../../third_party/dart/third_party/pkg/file/packages/file
glob:
path: ../../../third_party/dart/third_party/pkg/glob
litetest:
Expand Down
2 changes: 1 addition & 1 deletion tools/clang_tidy/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependency_overrides:
expect:
path: ../../../third_party/dart/pkg/expect
file:
path: ../../../third_party/pkg/file/packages/file
path: ../../../third_party/dart/third_party/pkg/file/packages/file
git_repo_tools:
path: ../pkg/git_repo_tools
litetest:
Expand Down
2 changes: 1 addition & 1 deletion tools/githooks/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependency_overrides:
expect:
path: ../../../third_party/dart/pkg/expect
file:
path: ../../../third_party/pkg/file/packages/file
path: ../../../third_party/dart/third_party/pkg/file/packages/file
git_repo_tools:
path: ../pkg/git_repo_tools
litetest:
Expand Down
2 changes: 1 addition & 1 deletion tools/licenses/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ environment:
dependencies:
archive: any
args: any
collection: ^1.16.0
collection: any
crypto: any
meta: any
path: any
Expand Down
2 changes: 1 addition & 1 deletion tools/pkg/engine_build_configs/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependency_overrides:
expect:
path: ../../../../third_party/dart/pkg/expect
file:
path: ../../../../third_party/pkg/file/packages/file
path: ../../../../third_party/dart/third_party/pkg/file/packages/file
litetest:
path: ../../../testing/litetest
meta:
Expand Down
2 changes: 1 addition & 1 deletion tools/pkg/git_repo_tools/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependency_overrides:
expect:
path: ../../../../third_party/dart/pkg/expect
file:
path: ../../../../third_party/pkg/file/packages/file
path: ../../../../third_party/dart/third_party/pkg/file/packages/file
litetest:
path: ../../../testing/litetest
meta:
Expand Down
2 changes: 1 addition & 1 deletion tools/pkg/process_fakes/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:

dependency_overrides:
file:
path: ../../../../third_party/pkg/file/packages/file
path: ../../../../third_party/dart/third_party/pkg/file/packages/file
meta:
path: ../../../../third_party/dart/pkg/meta
path:
Expand Down
2 changes: 1 addition & 1 deletion web_sdk/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependency_overrides: # Must include all transitive dependencies from the "any"
dart_internal:
path: ../../third_party/dart/pkg/dart_internal
file:
path: ../../third_party/pkg/file/packages/file
path: ../../third_party/dart/third_party/pkg/file/packages/file
glob:
path: ../../third_party/dart/third_party/pkg/glob
meta:
Expand Down

0 comments on commit e887450

Please sign in to comment.