Skip to content

Commit

Permalink
prep packages for release, add back to workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
jakemac53 committed Dec 16, 2024
1 parent 0c1e9db commit 23f6ec7
Show file tree
Hide file tree
Showing 25 changed files with 51 additions and 119 deletions.
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
14 changes: 2 additions & 12 deletions _test_common/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
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
sdk: ^3.6.0

dependencies:
build: any
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
4 changes: 2 additions & 2 deletions build/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## 2.4.2-wip
## 2.4.2

- Bump the min sdk to 3.6.0-228.0.dev.
- Bump the min sdk to 3.6.0.
- Remove some unnecessary casts and non-null assertions now that we have private
field promotion.
- Require analyzer ^6.9.0, allow <8.0.0.
Expand Down
13 changes: 3 additions & 10 deletions build/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
name: build
version: 2.4.2-wip
version: 2.4.2
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
sdk: ^3.6.0

dependencies:
analyzer: '>=6.9.0 <8.0.0'
Expand All @@ -27,10 +24,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
4 changes: 2 additions & 2 deletions build_config/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## 1.1.2-wip
## 1.1.2

- Stop using deprecated `JsonKey.ignore`.
- Bump the min sdk to 3.5.0.
- Bump the min sdk to 3.6.0.

## 1.1.1

Expand Down
4 changes: 2 additions & 2 deletions build_config/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: build_config
version: 1.1.2-wip
version: 1.1.2
description: >-
Format definition and support for parsing `build.yaml` configuration.
repository: https://github.com/dart-lang/build/tree/master/build_config
resolution: workspace

environment:
sdk: ^3.5.0
sdk: ^3.6.0

dependencies:
checked_yaml: ^2.0.0
Expand Down
4 changes: 2 additions & 2 deletions build_daemon/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## 4.0.3-wip
## 4.0.3

- Bump the min sdk to 3.5.0.
- Bump the min sdk to 3.6.0.
- Update to be forward compatible with changes to `package:shelf_web_socket`.

## 4.0.2
Expand Down
4 changes: 2 additions & 2 deletions build_daemon/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: build_daemon
version: 4.0.3-wip
version: 4.0.3
description: A daemon for running Dart builds.
repository: https://github.com/dart-lang/build/tree/master/build_daemon
resolution: workspace

environment:
sdk: ^3.5.0
sdk: ^3.6.0

dependencies:
built_collection: ^5.0.0
Expand Down
2 changes: 1 addition & 1 deletion build_modules/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 5.0.10-wip
## 5.0.10

- Support analyzer version 7.x.

Expand Down
4 changes: 2 additions & 2 deletions build_modules/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: build_modules
version: 5.0.10-wip
version: 5.0.10
description: >-
Builders to analyze and split Dart code into individually compilable modules
based on imports.
repository: https://github.com/dart-lang/build/tree/master/build_modules
resolution: workspace

environment:
sdk: '>=3.5.0 <3.7.0-z'
sdk: '>=3.6.0 <3.7.0-z'

dependencies:
analyzer: '>=5.1.0 <8.0.0'
Expand Down
2 changes: 1 addition & 1 deletion build_resolvers/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 2.4.3-wip
## 2.4.3

- Require the latest analyzer, and stop passing the `withNullability`
parameter which was previously required and is now deprecated.
Expand Down
7 changes: 2 additions & 5 deletions build_resolvers/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
name: build_resolvers
version: 2.4.3-wip
version: 2.4.3
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
2 changes: 1 addition & 1 deletion build_runner/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 2.4.14-wip
## 2.4.14

- Write generated assets at the end of a build to avoid invalidating other
tools with a file watcher multiple times.
Expand Down
18 changes: 3 additions & 15 deletions build_runner/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: build_runner
version: 2.4.14-wip
version: 2.4.14
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 All @@ -20,7 +20,7 @@ dependencies:
build_config: ">=1.1.0 <1.2.0"
build_daemon: ^4.0.0
build_resolvers: ^2.0.0
build_runner_core: ^8.0.0-wip
build_runner_core: ^8.0.0
code_builder: ^4.2.0
collection: ^1.15.0
crypto: ^3.0.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
2 changes: 1 addition & 1 deletion build_runner_core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 8.0.0-wip
## 8.0.0

- __Breaking__: Add `completeBuild` to `RunnerAssetWriter`, a method expected
to be called by the build system at the end of a completed build.
Expand Down
8 changes: 2 additions & 6 deletions build_runner_core/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: build_runner_core
version: 8.0.0-wip
version: 8.0.0
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 +49,3 @@ dev_dependencies:

topics:
- build-runner

dependency_overrides:
build_runner:
path: ../build_runner
4 changes: 2 additions & 2 deletions build_test/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## 2.2.3-wip
## 2.2.3

- Bump the min sdk to 3.5.0.
- Bump the min sdk to 3.6.0.
- Allow analyzer version 7.x.

## 2.2.2
Expand Down
2 changes: 1 addition & 1 deletion build_test/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: build_test
description: Utilities for writing unit tests of Builders.
version: 2.2.3-wip
version: 2.2.3
repository: https://github.com/dart-lang/build/tree/master/build_test
resolution: workspace

Expand Down
2 changes: 1 addition & 1 deletion build_web_compilers/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 4.1.0-wip
## 4.1.0

- Support package:archive version 4.x.
- Allow analyzer version 7.x.
Expand Down
9 changes: 2 additions & 7 deletions build_web_compilers/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: build_web_compilers
version: 4.1.0-wip
version: 4.1.0
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 +42,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
4 changes: 2 additions & 2 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: example
publish_to: none
environment:
sdk: ^3.5.0
sdk: ^3.6.0
resolution: workspace

dependencies:
analyzer: ">=5.0.0 <7.0.0"
analyzer: ">=5.0.0 <8.0.0"
build: ^2.0.0
# Not imported in code, but used to constrain `build.yaml` requirements
build_config: ^1.0.0
Expand Down
28 changes: 11 additions & 17 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
name: build_workspace # Can be anything
environment:
sdk: ^3.5.0 # Must be ^3.5.0 or later for workspace to be allowed
sdk: ^3.6.0
publish_to: none
dev_dependencies:
dart_flutter_team_lints: ^3.1.0

# build_web_compilers is not currently part of the workspace because it
# requires a very recent version of the Dart SDK. mono_repo generates a CI
# definition that runs each package with the lowest SDK version it supports.
# This breaks `dart pub get` in the entire workspace, so it (and `_test` which
# 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
- build_modules/test/fixtures/a
- build_modules/test/fixtures/b
#- build_web_compilers/test/fixtures/c
#- build_web_compilers/test/fixtures/d
- build_web_compilers/test/fixtures/c
- build_web_compilers/test/fixtures/d
2 changes: 1 addition & 1 deletion scratch_space/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## 1.0.3-wip

- Bump the min sdk to 3.5.0.
- Bump the min sdk to 3.6.0.

## 1.0.2

Expand Down
2 changes: 1 addition & 1 deletion scratch_space/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ topics:
- codegen

environment:
sdk: ^3.5.0
sdk: ^3.6.0

dependencies:
build: ^2.0.0
Expand Down
2 changes: 1 addition & 1 deletion tool/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Collection of scripts used during development of build packages.
resolution: workspace

environment:
sdk: ^3.5.0
sdk: ^3.6.0

dependencies:
path: ^1.8.0
Expand Down

0 comments on commit 23f6ec7

Please sign in to comment.