Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move some Dart packages to //flutter/third_party/pkg #47654

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Move some Dart packages to //flutter/third_party/pkg #47654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,31 +635,31 @@ deps = {
Var('flutter_git') + '/third_party/abseil-cpp.git' + '@' + '61833f2c057a2b1993d871e8c51156aed1dd4354',

# Dart packages
'src/third_party/pkg/archive':
'src/flutter/third_party/pkg/archive':
Var('github_git') + '/brendan-duncan/archive.git' + '@' + '9de7a0544457c6aba755ccb65abb41b0dc1db70d', # 3.1.2

'src/third_party/pkg/equatable':
'src/flutter/third_party/pkg/equatable':
Var('github_git') + '/felangel/equatable.git' + '@' + '2117551ff3054f8edb1a58f63ffe1832a8d25623', # 2.0.5

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

'src/third_party/pkg/gcloud':
'src/flutter/third_party/pkg/gcloud':
Var('github_git') + '/dart-lang/gcloud.git' + '@' + 'a5276b85c4714378e84b1fb478b8feeeb686ac26', # 0.8.6-dev

'src/third_party/pkg/googleapis':
'src/flutter/third_party/pkg/googleapis':
Var('github_git') + '/google/googleapis.dart.git' + '@' + '526011f56d98eab183cc6075ee1392e8303e43e2', # various

'src/third_party/pkg/platform':
'src/flutter/third_party/pkg/platform':
Var('dart_git') + '/platform.dart' + '@' + '1ffad63428bbd1b3ecaa15926bacfb724023648c', # 3.1.0

'src/third_party/pkg/process':
'src/flutter/third_party/pkg/process':
Var('dart_git') + '/process.dart' + '@' + '0c9aeac86dcc4e3a6cf760b76fed507107e244d5', # 4.2.1

'src/third_party/pkg/process_runner':
'src/flutter/third_party/pkg/process_runner':
Var('github_git') + '/google/process_runner.git' + '@' + 'f24c69efdcaf109168f23d381fa281453d2bc9b1', # 4.1.2

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

'src/flutter/third_party/imgui':
Expand Down
18 changes: 9 additions & 9 deletions ci/licenses_golden/excluded_files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,15 @@
../../../flutter/third_party/libtess2/README.md
../../../flutter/third_party/libtess2/alg_outline.md
../../../flutter/third_party/ninja
../../../flutter/third_party/pkg/archive
../../../flutter/third_party/pkg/equatable
../../../flutter/third_party/pkg/flutter_packages
../../../flutter/third_party/pkg/gcloud
../../../flutter/third_party/pkg/googleapis
../../../flutter/third_party/pkg/platform
../../../flutter/third_party/pkg/process
../../../flutter/third_party/pkg/process_runner
../../../flutter/third_party/pkg/vector_math
../../../flutter/third_party/rapidjson/.git
../../../flutter/third_party/rapidjson/.gitattributes
../../../flutter/third_party/rapidjson/.gitignore
Expand Down Expand Up @@ -2640,15 +2649,6 @@
../../../third_party/perfetto/ui/src/plugins/dev.perfetto.AndroidPerf/OWNERS
../../../third_party/perfetto/ui/src/plugins/dev.perfetto.LargeScreensPerf/OWNERS
../../../third_party/perfetto/ui/src/test
../../../third_party/pkg/archive
../../../third_party/pkg/equatable
../../../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/vector_math
../../../third_party/protobuf
../../../third_party/pyyaml
../../../third_party/root_certificates/.git
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: 58eabd70bbf9797956ee94d042df857d
Signature: 69d986a7b2275b798b574b6aea2c1b78

6 changes: 3 additions & 3 deletions ci/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ dependency_overrides:
path:
path: ../../third_party/dart/third_party/pkg/path
platform:
path: ../../third_party/pkg/platform
path: ../third_party/pkg/platform
process:
path: ../../third_party/pkg/process
path: ../third_party/pkg/process
process_runner:
path: ../../third_party/pkg/process_runner
path: ../third_party/pkg/process_runner
smith:
path: ../../third_party/dart/pkg/smith
4 changes: 2 additions & 2 deletions impeller/golden_tests_harvester/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ dependency_overrides:
path:
path: ../../../third_party/dart/third_party/pkg/path
platform:
path: ../../../third_party/pkg/platform
path: ../../third_party/pkg/platform
process:
path: ../../../third_party/pkg/process
path: ../../third_party/pkg/process
typed_data:
path: ../../../third_party/dart/third_party/pkg/typed_data
2 changes: 1 addition & 1 deletion shell/platform/fuchsia/dart/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ dart_library("quiver") {
}

dart_library("vector_math") {
package_root = "//third_party/pkg/vector_math"
package_root = "//flutter/third_party/pkg/vector_math"
package_name = "vector_math"

pubspec = "$package_root/pubspec.yaml"
Expand Down
12 changes: 6 additions & 6 deletions testing/benchmark/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dev_dependencies:

dependency_overrides:
_discoveryapis_commons:
path: ../../../third_party/pkg/googleapis/discoveryapis_commons
path: ../../third_party/pkg/googleapis/discoveryapis_commons
args:
path: ../../../third_party/dart/third_party/pkg/args
async_helper:
Expand All @@ -40,15 +40,15 @@ dependency_overrides:
crypto :
path: ../../../third_party/dart/third_party/pkg/crypto
equatable:
path: ../../../third_party/pkg/equatable
path: ../../third_party/pkg/equatable
expect:
path: ../../../third_party/dart/pkg/expect
gcloud:
path: ../../../third_party/pkg/gcloud
path: ../../third_party/pkg/gcloud
googleapis:
path: ../../../third_party/pkg/googleapis/generated/googleapis
path: ../../third_party/pkg/googleapis/generated/googleapis
googleapis_auth:
path: ../../../third_party/pkg/googleapis/googleapis_auth
path: ../../third_party/pkg/googleapis/googleapis_auth
http:
path: ../../../third_party/dart/third_party/pkg/http/pkgs/http
http_parser:
Expand All @@ -60,7 +60,7 @@ dependency_overrides:
meta:
path: ../../../third_party/dart/pkg/meta
metrics_center:
path: ../../../third_party/pkg/flutter_packages/packages/metrics_center
path: ../../third_party/pkg/flutter_packages/packages/metrics_center
path:
path: ../../../third_party/dart/third_party/pkg/path
smith:
Expand Down
6 changes: 3 additions & 3 deletions testing/dart/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ dependency_overrides:
path:
path: ../../../third_party/dart/third_party/pkg/path
platform:
path: ../../../third_party/pkg/platform
path: ../../third_party/pkg/platform
process:
path: ../../../third_party/pkg/process
path: ../../third_party/pkg/process
protobuf:
path: ../../../third_party/dart/third_party/pkg/protobuf/protobuf
smith:
Expand All @@ -61,7 +61,7 @@ dependency_overrides:
typed_data:
path: ../../../third_party/dart/third_party/pkg/typed_data
vector_math:
path: ../../../third_party/pkg/vector_math
path: ../../third_party/pkg/vector_math
vm_service:
path: ../../../third_party/dart/pkg/vm_service
vm_service_protos:
Expand Down
6 changes: 3 additions & 3 deletions testing/scenario_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ dependency_overrides:
path:
path: ../../../third_party/dart/third_party/pkg/path
platform:
path: ../../../third_party/pkg/platform
path: ../../third_party/pkg/platform
process:
path: ../../../third_party/pkg/process
path: ../../third_party/pkg/process
skia_gold_client:
path: ../../testing/skia_gold_client
sky_engine:
path: ../../sky/packages/sky_engine
typed_data:
path: ../../../third_party/dart/third_party/pkg/typed_data
vector_math:
path: ../../../third_party/pkg/vector_math
path: ../../third_party/pkg/vector_math
4 changes: 2 additions & 2 deletions testing/skia_gold_client/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ dependency_overrides:
path:
path: ../../../third_party/dart/third_party/pkg/path
platform:
path: ../../../third_party/pkg/platform
path: ../../third_party/pkg/platform
process:
path: ../../../third_party/pkg/process
path: ../../third_party/pkg/process
typed_data:
path: ../../../third_party/dart/third_party/pkg/typed_data
4 changes: 2 additions & 2 deletions tools/android_lint/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ dependency_overrides:
path:
path: ../../../third_party/dart/third_party/pkg/path
platform:
path: ../../../third_party/pkg/platform
path: ../../third_party/pkg/platform
process:
path: ../../../third_party/pkg/process
path: ../../third_party/pkg/process
6 changes: 3 additions & 3 deletions tools/clang_tidy/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ dependency_overrides:
path:
path: ../../../third_party/dart/third_party/pkg/path
platform:
path: ../../../third_party/pkg/platform
path: ../../third_party/pkg/platform
process:
path: ../../../third_party/pkg/process
path: ../../third_party/pkg/process
process_fakes:
path: ../pkg/process_fakes
process_runner:
path: ../../../third_party/pkg/process_runner
path: ../../third_party/pkg/process_runner
smith:
path: ../../../third_party/dart/pkg/smith
6 changes: 3 additions & 3 deletions tools/githooks/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ dependency_overrides:
path:
path: ../../../third_party/dart/third_party/pkg/path
platform:
path: ../../../third_party/pkg/platform
path: ../../third_party/pkg/platform
process:
path: ../../../third_party/pkg/process
path: ../../third_party/pkg/process
process_runner:
path: ../../../third_party/pkg/process_runner
path: ../../third_party/pkg/process_runner
smith:
path: ../../../third_party/dart/pkg/smith
20 changes: 9 additions & 11 deletions tools/licenses/lib/paths.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ final Set<String> skippedPaths = <String>{
r'flutter/third_party/gn',
r'flutter/third_party/imgui',
r'flutter/third_party/ninja', // build system
r'flutter/third_party/pkg/archive', // contains nothing that ends up in the binary executable
r'flutter/third_party/pkg/equatable',
r'flutter/third_party/pkg/flutter_packages',
r'flutter/third_party/pkg/gcloud',
r'flutter/third_party/pkg/googleapis',
r'flutter/third_party/pkg/platform',
r'flutter/third_party/pkg/process',
r'flutter/third_party/pkg/process_runner',
r'flutter/third_party/pkg/vector_math',
r'flutter/third_party/rapidjson/contrib', // contains nothing that ends up in the binary executable
r'flutter/third_party/rapidjson/doc', // documentation
r'flutter/third_party/shaderc/third_party/LICENSE.glslang', // unclear what the purpose of this file is
Expand Down Expand Up @@ -152,17 +161,6 @@ final Set<String> skippedPaths = <String>{
r'third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable
r'third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable
r'third_party/protobuf', // build-time dependency only
r'third_party/pkg/archive', // contains nothing that ends up in the binary executable
r'third_party/pkg/equatable',
r'third_party/pkg/file',
r'third_party/pkg/flutter_packages',
r'third_party/pkg/gcloud',
r'third_party/pkg/googleapis',
r'third_party/pkg/platform',
r'third_party/pkg/process',
r'third_party/pkg/process_runner',
r'third_party/pkg/quiver',
r'third_party/pkg/vector_math',
r'third_party/pyyaml', // build-time dependency only
r'third_party/root_certificates/certdata.pem',
r'third_party/root_certificates/certdata.txt',
Expand Down
2 changes: 1 addition & 1 deletion tools/licenses/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dev_dependencies:

dependency_overrides:
archive:
path: ../../../third_party/pkg/archive
path: ../../third_party/pkg/archive
args:
path: ../../../third_party/dart/third_party/pkg/args
async_helper:
Expand Down
6 changes: 3 additions & 3 deletions tools/pkg/engine_build_configs/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ dependency_overrides:
path:
path: ../../../../third_party/dart/third_party/pkg/path
platform:
path: ../../../../third_party/pkg/platform
path: ../../../third_party/pkg/platform
process:
path: ../../../../third_party/pkg/process
path: ../../../third_party/pkg/process
process_runner:
path: ../../../../third_party/pkg/process_runner
path: ../../../third_party/pkg/process_runner
smith:
path: ../../../../third_party/dart/pkg/smith
6 changes: 3 additions & 3 deletions tools/pkg/git_repo_tools/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ dependency_overrides:
path:
path: ../../../../third_party/dart/third_party/pkg/path
platform:
path: ../../../../third_party/pkg/platform
path: ../../../third_party/pkg/platform
process:
path: ../../../../third_party/pkg/process
path: ../../../third_party/pkg/process
process_fakes:
path: ../process_fakes
process_runner:
path: ../../../../third_party/pkg/process_runner
path: ../../../third_party/pkg/process_runner
smith:
path: ../../../../third_party/dart/pkg/smith
4 changes: 2 additions & 2 deletions tools/pkg/process_fakes/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ dependency_overrides:
path:
path: ../../../../third_party/dart/third_party/pkg/path
platform:
path: ../../../../third_party/pkg/platform
path: ../../../third_party/pkg/platform
process:
path: ../../../../third_party/pkg/process
path: ../../../third_party/pkg/process