diff --git a/DEPS b/DEPS index d8b5266d99ba0..d5f4cbf164708 100644 --- a/DEPS +++ b/DEPS @@ -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 @@ -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 diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index 2c0e7445bf664..9c7aa803a44b2 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -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 diff --git a/ci/pubspec.yaml b/ci/pubspec.yaml index 8a662bdd57134..ddb73b23a1273 100644 --- a/ci/pubspec.yaml +++ b/ci/pubspec.yaml @@ -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: diff --git a/impeller/golden_tests_harvester/pubspec.yaml b/impeller/golden_tests_harvester/pubspec.yaml index bbb49e9cabbd5..d733c8c162583 100644 --- a/impeller/golden_tests_harvester/pubspec.yaml +++ b/impeller/golden_tests_harvester/pubspec.yaml @@ -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: diff --git a/testing/scenario_app/pubspec.yaml b/testing/scenario_app/pubspec.yaml index c2b5d8425f9a3..4c579aa4d8230 100644 --- a/testing/scenario_app/pubspec.yaml +++ b/testing/scenario_app/pubspec.yaml @@ -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: diff --git a/testing/skia_gold_client/pubspec.yaml b/testing/skia_gold_client/pubspec.yaml index 53add9bf3093d..8c7bc0a6a7ff9 100644 --- a/testing/skia_gold_client/pubspec.yaml +++ b/testing/skia_gold_client/pubspec.yaml @@ -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: diff --git a/tools/android_lint/pubspec.yaml b/tools/android_lint/pubspec.yaml index f60899e9ae2d8..236ae4e40af7c 100644 --- a/tools/android_lint/pubspec.yaml +++ b/tools/android_lint/pubspec.yaml @@ -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: diff --git a/tools/api_check/pubspec.yaml b/tools/api_check/pubspec.yaml index 1f33a38ad53f7..5419c3c4d5775 100644 --- a/tools/api_check/pubspec.yaml +++ b/tools/api_check/pubspec.yaml @@ -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: diff --git a/tools/clang_tidy/pubspec.yaml b/tools/clang_tidy/pubspec.yaml index 3dbe9e04ac86a..0a5625c897a72 100644 --- a/tools/clang_tidy/pubspec.yaml +++ b/tools/clang_tidy/pubspec.yaml @@ -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: diff --git a/tools/githooks/pubspec.yaml b/tools/githooks/pubspec.yaml index 66755904f2fd5..ae8bca757bf6e 100644 --- a/tools/githooks/pubspec.yaml +++ b/tools/githooks/pubspec.yaml @@ -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: diff --git a/tools/licenses/pubspec.yaml b/tools/licenses/pubspec.yaml index 67a905e9c02c2..35a59cebc782c 100644 --- a/tools/licenses/pubspec.yaml +++ b/tools/licenses/pubspec.yaml @@ -20,7 +20,7 @@ environment: dependencies: archive: any args: any - collection: ^1.16.0 + collection: any crypto: any meta: any path: any diff --git a/tools/pkg/engine_build_configs/pubspec.yaml b/tools/pkg/engine_build_configs/pubspec.yaml index 8aeeda6181890..f3d7bf02bd63c 100644 --- a/tools/pkg/engine_build_configs/pubspec.yaml +++ b/tools/pkg/engine_build_configs/pubspec.yaml @@ -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: diff --git a/tools/pkg/git_repo_tools/pubspec.yaml b/tools/pkg/git_repo_tools/pubspec.yaml index 1cf937a42d22d..d1fda23da47d9 100644 --- a/tools/pkg/git_repo_tools/pubspec.yaml +++ b/tools/pkg/git_repo_tools/pubspec.yaml @@ -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: diff --git a/tools/pkg/process_fakes/pubspec.yaml b/tools/pkg/process_fakes/pubspec.yaml index 8ac6e85aa88fe..c2e2c3e6f2daa 100644 --- a/tools/pkg/process_fakes/pubspec.yaml +++ b/tools/pkg/process_fakes/pubspec.yaml @@ -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: diff --git a/web_sdk/pubspec.yaml b/web_sdk/pubspec.yaml index 9d413a1cc5992..a8522ce5944a1 100644 --- a/web_sdk/pubspec.yaml +++ b/web_sdk/pubspec.yaml @@ -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: