diff --git a/pkg/_js_interop_checks/pubspec.yaml b/pkg/_js_interop_checks/pubspec.yaml index bae19925409..53c668a4929 100644 --- a/pkg/_js_interop_checks/pubspec.yaml +++ b/pkg/_js_interop_checks/pubspec.yaml @@ -6,7 +6,10 @@ environment: sdk: '>=2.12.0 <3.0.0' dependencies: - _fe_analyzer_shared: - path: ../_fe_analyzer_shared + _fe_analyzer_shared: any kernel: path: ../kernel + +dependency_overrides: + _fe_analyzer_shared: + path: ../_fe_analyzer_shared diff --git a/pkg/compiler/pubspec.yaml b/pkg/compiler/pubspec.yaml index ad1c27b67ca..bbee8a4f99b 100644 --- a/pkg/compiler/pubspec.yaml +++ b/pkg/compiler/pubspec.yaml @@ -9,6 +9,7 @@ environment: # NOTE: `pub get / pub upgrade` are generally not needed when working on this # package. The `.packages` file in the repository root will be used by default. dependencies: + _fe_analyzer_shared: any # Published packages - repo version ensured via dependency_overrides collection: any crypto: any @@ -20,8 +21,6 @@ dependencies: path: ../kernel # Unpublished packages that can be used via path dependency - _fe_analyzer_shared: - path: ../_fe_analyzer_shared _js_interop_checks: path: ../_js_interop_checks js_ast: diff --git a/pkg/dev_compiler/pubspec.yaml b/pkg/dev_compiler/pubspec.yaml index e0271f35187..cd3390a969a 100644 --- a/pkg/dev_compiler/pubspec.yaml +++ b/pkg/dev_compiler/pubspec.yaml @@ -6,8 +6,7 @@ environment: sdk: '>=2.12.0 <3.0.0' dependencies: - _fe_analyzer_shared: - path: ../_fe_analyzer_shared + _fe_analyzer_shared: any _js_interop_checks: path: ../_js_interop_checks args: any @@ -21,8 +20,7 @@ dependencies: path: ../front_end kernel: path: ../kernel - meta: - path: ../meta + meta: any path: any pedantic: ^1.11.0 source_maps: any @@ -32,18 +30,15 @@ dev_dependencies: browser_launcher: ^1.0.0 expect: path: ../expect - http_multi_server: - path: ../../third_party/pkg/http_multi_server - js: - path: ../js + http_multi_server: any + js: any modular_test: path: ../modular_test package_config: any sourcemap_testing: path: ../sourcemap_testing stack_trace: any - shelf: - path: ../../third_party/pkg/shelf + shelf: any test: any testing: path: ../testing @@ -51,3 +46,14 @@ dev_dependencies: path: ../vm webkit_inspection_protocol: ^1.0.0 +dependency_overrides: + _fe_analyzer_shared: + path: ../_fe_analyzer_shared + js: + path: ../js + meta: + path: ../meta + shelf: + path: ../../third_party/pkg/shelf + http_multi_server: + path: ../../third_party/pkg/http_multi_server diff --git a/pkg/expect/pubspec.yaml b/pkg/expect/pubspec.yaml index f84f8c96eda..70c2817088f 100644 --- a/pkg/expect/pubspec.yaml +++ b/pkg/expect/pubspec.yaml @@ -12,5 +12,8 @@ environment: sdk: '>=2.12.0 <3.0.0' dependencies: - meta: - path: ../meta + meta: any + +dependency_overrides: + meta: + path: ../meta diff --git a/pkg/front_end/pubspec.yaml b/pkg/front_end/pubspec.yaml index 9e67ea31412..4fff6ab1e24 100644 --- a/pkg/front_end/pubspec.yaml +++ b/pkg/front_end/pubspec.yaml @@ -9,37 +9,43 @@ environment: sdk: '>=2.13.0 <3.0.0' dependencies: - _fe_analyzer_shared: - path: ../_fe_analyzer_shared + _fe_analyzer_shared: any kernel: path: ../kernel - package_config: - path: ../../third_party/pkg_tested/package_config + package_config: any dev_dependencies: - analyzer: - path: ../analyzer - args: '>=0.13.0 <2.0.0' + analyzer: any + args: ^2.0.0 async_helper: path: ../async_helper build_integration: path: ../build_integration compiler: path: ../compiler - dart_style: '^1.0.7' + dart_style: ^2.0.0 dev_compiler: path: ../dev_compiler expect: path: ../expect - json_rpc_2: ^2.0.9 - path: '^1.3.9' + json_rpc_2: ^3.0.0 + path: ^1.3.9 test: ^1.3.4 testing: path: ../testing - test_reflective_loader: ^0.1.0 + test_reflective_loader: ^0.2.0 vm: path: ../vm + vm_service: any + web_socket_channel: ^2.0.0 + yaml: any + +dependency_overrides: + analyzer: + path: ../analyzer + _fe_analyzer_shared: + path: ../_fe_analyzer_shared + package_config: + path: ../../third_party/pkg_tested/package_config vm_service: path: ../vm_service - web_socket_channel: ^1.0.4 - yaml: any diff --git a/pkg/status_file/pubspec.yaml b/pkg/status_file/pubspec.yaml index 1536b639e70..5f9e8e26068 100644 --- a/pkg/status_file/pubspec.yaml +++ b/pkg/status_file/pubspec.yaml @@ -5,7 +5,8 @@ environment: sdk: "^2.12.0" dependencies: path: "^1.4.0" - args: "^1.4.4" + args: ^2.0.0 + dev_dependencies: expect: path: ../expect diff --git a/pkg/vm/pubspec.yaml b/pkg/vm/pubspec.yaml index 20b2cd728dd..3ae9534c209 100644 --- a/pkg/vm/pubspec.yaml +++ b/pkg/vm/pubspec.yaml @@ -7,7 +7,7 @@ environment: sdk: '>=2.12.0 <3.0.0' dependencies: - args: ^1.4.4 + args: ^2.0.0 build_integration: path: ../build_integration crypto: any @@ -25,7 +25,3 @@ dev_dependencies: path: any test: any web_socket_channel: any - -dependency_overrides: - front_end: - path: ../front_end