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.

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

Move things back to the workspace #3785

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 1 addition & 22 deletions _test/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: _test
publish_to: none
# This package can't be part of the workspace because it needs to use the local
# build_web_compilers, which also isn't part of the workspace. See the top-
# level pubspec for details.
#resolution: workspace
resolution: workspace

environment:
sdk: ^3.6.0
Expand All @@ -29,21 +26,3 @@ dev_dependencies:
test: ^1.16.0
test_descriptor: ^2.0.1
test_process: ^2.0.0

dependency_overrides:
build:
path: ../build
build_config:
path: ../build_config
build_modules:
path: ../build_modules
build_resolvers:
path: ../build_resolvers
build_runner:
path: ../build_runner
build_runner_core:
path: ../build_runner_core
build_test:
path: ../build_test
build_web_compilers:
path: ../build_web_compilers
12 changes: 1 addition & 11 deletions _test_common/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: _test_common
publish_to: none
description: Test infra for writing build tests. Is not published.
#resolution: workspace
resolution: workspace

environment:
sdk: ^3.5.0
Expand All @@ -22,13 +22,3 @@ dependencies:

dev_dependencies:
dart_flutter_team_lints: ^3.1.0

dependency_overrides:
build:
path: ../build
build_config:
path: ../build_config
build_runner_core:
path: ../build_runner_core
build_test:
path: ../build_test
8 changes: 1 addition & 7 deletions build/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ version: 2.4.2-wip
description: A package for authoring build_runner compatible code generators.
repository: https://github.com/dart-lang/build/tree/master/build

# This package can't be part of the workspace because it requires a very recent
# Dart SDK - see the top-level pubspec for details.
#resolution: workspace
resolution: workspace

environment:
sdk: ^3.6.0-228.0.dev
Expand All @@ -27,10 +25,6 @@ dev_dependencies:
dart_flutter_team_lints: ^3.1.0
test: ^1.16.0

dependency_overrides:
build_resolvers:
path: ../build_resolvers

topics:
- build-runner
- codegen
Expand Down
5 changes: 1 addition & 4 deletions build_resolvers/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ name: build_resolvers
version: 2.4.3-wip
description: Resolve Dart code in a Builder
repository: https://github.com/dart-lang/build/tree/master/build_resolvers

# This package can't be part of the workspace because it requires a very recent
# Dart SDK - see the top-level pubspec for details.
#resolution: workspace
resolution: workspace

environment:
sdk: ^3.6.0
Expand Down
14 changes: 1 addition & 13 deletions build_runner/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: build_runner
version: 2.4.14-wip
description: A build system for Dart code generation and modular compilation.
repository: https://github.com/dart-lang/build/tree/master/build_runner
#resolution: workspace
resolution: workspace

environment:
sdk: ^3.6.0
Expand Down Expand Up @@ -59,17 +59,5 @@ dev_dependencies:
test_descriptor: ^2.0.0
test_process: ^2.0.0

dependency_overrides:
build:
path: ../build
build_modules:
path: ../build_modules
build_resolvers:
path: ../build_resolvers
build_runner_core:
path: ../build_runner_core
build_web_compilers:
path: ../build_web_compilers

topics:
- build-runner
9 changes: 1 addition & 8 deletions build_runner_core/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ name: build_runner_core
version: 8.0.0-wip
description: Core tools to organize the structure of a build and run Builders.
repository: https://github.com/dart-lang/build/tree/master/build_runner_core

# This package can't be part of the workspace because it requires a very recent
# Dart SDK - see the top-level pubspec for details.
#resolution: workspace
resolution: workspace

environment:
sdk: ^3.6.0
Expand Down Expand Up @@ -49,7 +46,3 @@ dev_dependencies:

topics:
- build-runner

dependency_overrides:
build_runner:
path: ../build_runner
9 changes: 1 addition & 8 deletions build_web_compilers/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ name: build_web_compilers
version: 4.1.0-wip
description: Builder implementations wrapping the dart2js and DDC compilers.
repository: https://github.com/dart-lang/build/tree/master/build_web_compilers
# This package can't be part of the workspace because it requires a very recent
# Dart SDK - see the top-level pubspec for details.
#resolution: workspace
resolution: workspace

environment:
sdk: '>=3.6.0 <3.7.0-z'
Expand Down Expand Up @@ -42,10 +40,5 @@ dev_dependencies:
test: ^1.16.0
yaml: ^3.1.0

# TODO: remove once this package is back in the workspace
dependency_overrides:
build_modules:
path: ../build_modules

topics:
- build-runner
16 changes: 8 additions & 8 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ dev_dependencies:
# needs to use all packages from the repository) can't be part of the
# workspace.
workspace:
#- _test
#- _test/pkgs/provides_builder
#- _test_common
# - build
- _test
- _test/pkgs/provides_builder
- _test_common
- build
- build_config
- build_daemon
- build_modules
# - build_resolvers
#- build_runner
# - build_runner_core
- build_resolvers
- build_runner
- build_runner_core
- build_test
#- build_web_compilers
- build_web_compilers
- example
- scratch_space
- tool
Expand Down
Loading