From 92103382e2db3887f18e3cf32f0933bb954fb8b6 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Fri, 14 Jun 2024 14:34:27 +0000 Subject: [PATCH 01/14] use pub workspaces feature --- _test/pkgs/provides_builder/pubspec.yaml | 4 +-- _test/pubspec.yaml | 25 ++----------------- _test_common/pubspec.yaml | 15 ++--------- analysis/pubspec.yaml | 3 ++- build/pubspec.yaml | 3 ++- build/pubspec_overrides.yaml | 7 ------ build_config/pubspec.yaml | 3 ++- build_config/pubspec_overrides.yaml | 15 ----------- build_daemon/pubspec.yaml | 7 ++---- build_daemon/pubspec_overrides.yaml | 17 ------------- build_modules/pubspec.yaml | 3 ++- build_modules/pubspec_overrides.yaml | 17 ------------- build_modules/test/fixtures/a/pubspec.yaml | 4 +-- build_modules/test/fixtures/b/pubspec.yaml | 4 +-- build_resolvers/pubspec.yaml | 3 ++- build_resolvers/pubspec_overrides.yaml | 7 ------ build_runner/pubspec.yaml | 3 ++- build_runner/pubspec_overrides.yaml | 19 -------------- build_runner_core/pubspec.yaml | 3 ++- build_runner_core/pubspec_overrides.yaml | 17 ------------- build_test/pubspec.yaml | 3 ++- build_test/pubspec_overrides.yaml | 7 ------ build_web_compilers/pubspec.yaml | 11 ++++---- build_web_compilers/pubspec_overrides.yaml | 19 -------------- .../test/fixtures/a/lib/a_cycle.dart | 5 ---- .../test/fixtures/a/lib/a_cycle_with_b.dart | 2 -- .../test/fixtures/a/lib/a_part_in_cycle.dart | 1 - .../test/fixtures/a/pubspec.yaml | 8 ------ .../test/fixtures/b/lib/b_cycle_with_a.dart | 2 -- .../test/fixtures/b/pubspec.yaml | 8 ------ .../test/fixtures/c/lib/c_cycle.dart | 5 ++++ .../test/fixtures/c/lib/c_cycle_with_d.dart | 2 ++ .../a_no_cycle.dart => c/lib/c_no_cycle.dart} | 0 .../test/fixtures/c/lib/c_part_in_cycle.dart | 1 + .../lib/c_secondary_in_cycle.dart} | 2 +- .../test/fixtures/c/pubspec.yaml | 9 +++++++ .../test/fixtures/d/lib/d_cycle_with_c.dart | 2 ++ .../test/fixtures/d/pubspec.yaml | 9 +++++++ example/pubspec.yaml | 8 ++---- pubspec.yaml | 24 ++++++++++++++++++ scratch_space/pubspec.yaml | 3 ++- scratch_space/pubspec_overrides.yaml | 17 ------------- tool/pubspec.yaml | 3 ++- 43 files changed, 93 insertions(+), 237 deletions(-) delete mode 100644 build/pubspec_overrides.yaml delete mode 100644 build_config/pubspec_overrides.yaml delete mode 100644 build_daemon/pubspec_overrides.yaml delete mode 100644 build_modules/pubspec_overrides.yaml delete mode 100644 build_resolvers/pubspec_overrides.yaml delete mode 100644 build_runner/pubspec_overrides.yaml delete mode 100644 build_runner_core/pubspec_overrides.yaml delete mode 100644 build_test/pubspec_overrides.yaml delete mode 100644 build_web_compilers/pubspec_overrides.yaml delete mode 100644 build_web_compilers/test/fixtures/a/lib/a_cycle.dart delete mode 100644 build_web_compilers/test/fixtures/a/lib/a_cycle_with_b.dart delete mode 100644 build_web_compilers/test/fixtures/a/lib/a_part_in_cycle.dart delete mode 100644 build_web_compilers/test/fixtures/a/pubspec.yaml delete mode 100644 build_web_compilers/test/fixtures/b/lib/b_cycle_with_a.dart delete mode 100644 build_web_compilers/test/fixtures/b/pubspec.yaml create mode 100644 build_web_compilers/test/fixtures/c/lib/c_cycle.dart create mode 100644 build_web_compilers/test/fixtures/c/lib/c_cycle_with_d.dart rename build_web_compilers/test/fixtures/{a/lib/a_no_cycle.dart => c/lib/c_no_cycle.dart} (100%) create mode 100644 build_web_compilers/test/fixtures/c/lib/c_part_in_cycle.dart rename build_web_compilers/test/fixtures/{a/lib/a_secondary_in_cycle.dart => c/lib/c_secondary_in_cycle.dart} (52%) create mode 100644 build_web_compilers/test/fixtures/c/pubspec.yaml create mode 100644 build_web_compilers/test/fixtures/d/lib/d_cycle_with_c.dart create mode 100644 build_web_compilers/test/fixtures/d/pubspec.yaml create mode 100644 pubspec.yaml delete mode 100644 scratch_space/pubspec_overrides.yaml diff --git a/_test/pkgs/provides_builder/pubspec.yaml b/_test/pkgs/provides_builder/pubspec.yaml index 58a2e498a..872fc9acd 100644 --- a/_test/pkgs/provides_builder/pubspec.yaml +++ b/_test/pkgs/provides_builder/pubspec.yaml @@ -1,7 +1,7 @@ name: provides_builder - +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dependencies: build: diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml index e5bc63743..02e370149 100644 --- a/_test/pubspec.yaml +++ b/_test/pubspec.yaml @@ -1,8 +1,9 @@ name: _test publish_to: none +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dev_dependencies: analyzer: any @@ -21,25 +22,3 @@ dev_dependencies: path: pkgs/provides_builder/ test: ^1.16.0 test_process: ^2.0.0 - -dependency_overrides: - build: - path: ../build - build_config: - path: ../build_config - build_daemon: - path: ../build_daemon - 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 - scratch_space: - path: ../scratch_space diff --git a/_test_common/pubspec.yaml b/_test_common/pubspec.yaml index b3da0a7dd..9f7ccdc34 100644 --- a/_test_common/pubspec.yaml +++ b/_test_common/pubspec.yaml @@ -1,9 +1,10 @@ name: _test_common publish_to: none description: Test infra for writing build tests. Is not published. +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dependencies: build: any @@ -21,15 +22,3 @@ dependencies: dev_dependencies: dart_flutter_team_lints: ^3.1.0 - -dependency_overrides: - build: - path: ../build - build_config: - path: ../build_config - build_resolvers: - path: ../build_resolvers - build_runner_core: - path: ../build_runner_core - build_test: - path: ../build_test diff --git a/analysis/pubspec.yaml b/analysis/pubspec.yaml index 36eecbed2..69e570599 100644 --- a/analysis/pubspec.yaml +++ b/analysis/pubspec.yaml @@ -2,7 +2,8 @@ # file to import package:dart_flutter_team_lints. name: _for_analysis_options_only publish_to: none +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dev_dependencies: dart_flutter_team_lints: ^3.1.0 diff --git a/build/pubspec.yaml b/build/pubspec.yaml index 6e741a88c..0286fd99d 100644 --- a/build/pubspec.yaml +++ b/build/pubspec.yaml @@ -2,9 +2,10 @@ name: build 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 +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dependencies: analyzer: ">=1.5.0 <7.0.0" diff --git a/build/pubspec_overrides.yaml b/build/pubspec_overrides.yaml deleted file mode 100644 index 14c8a8448..000000000 --- a/build/pubspec_overrides.yaml +++ /dev/null @@ -1,7 +0,0 @@ -dependency_overrides: - build_config: - path: ../build_config - build_resolvers: - path: ../build_resolvers - build_test: - path: ../build_test diff --git a/build_config/pubspec.yaml b/build_config/pubspec.yaml index f61835f3b..3c3c2f6a1 100644 --- a/build_config/pubspec.yaml +++ b/build_config/pubspec.yaml @@ -3,9 +3,10 @@ version: 1.1.2-wip 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.4.0 + sdk: ^3.5.0-0 dependencies: checked_yaml: ^2.0.0 diff --git a/build_config/pubspec_overrides.yaml b/build_config/pubspec_overrides.yaml deleted file mode 100644 index 885c6e685..000000000 --- a/build_config/pubspec_overrides.yaml +++ /dev/null @@ -1,15 +0,0 @@ -dependency_overrides: - build: - path: ../build - build_daemon: - path: ../build_daemon - build_modules: - path: ../build_modules - build_resolvers: - path: ../build_resolvers - build_runner: - path: ../build_runner - build_runner_core: - path: ../build_runner_core - scratch_space: - path: ../scratch_space diff --git a/build_daemon/pubspec.yaml b/build_daemon/pubspec.yaml index c6c98d2eb..ae375ecb9 100644 --- a/build_daemon/pubspec.yaml +++ b/build_daemon/pubspec.yaml @@ -2,9 +2,10 @@ name: build_daemon version: 4.0.2 description: A daemon for running Dart builds. repository: https://github.com/dart-lang/build/tree/master/build_daemon +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dependencies: built_collection: ^5.0.0 @@ -31,9 +32,5 @@ dev_dependencies: test_descriptor: ^2.0.0 uuid: ^3.0.0 -dependency_overrides: - build_runner: - path: ../build_runner - topics: - build-runner diff --git a/build_daemon/pubspec_overrides.yaml b/build_daemon/pubspec_overrides.yaml deleted file mode 100644 index 24d963358..000000000 --- a/build_daemon/pubspec_overrides.yaml +++ /dev/null @@ -1,17 +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 - scratch_space: - path: ../scratch_space diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml index 69407796d..1195e83c0 100644 --- a/build_modules/pubspec.yaml +++ b/build_modules/pubspec.yaml @@ -4,9 +4,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.0.0 <3.6.0' + sdk: '>=3.5.0-0 <3.6.0' dependencies: analyzer: '>=5.1.0 <7.0.0' diff --git a/build_modules/pubspec_overrides.yaml b/build_modules/pubspec_overrides.yaml deleted file mode 100644 index 02c6e6566..000000000 --- a/build_modules/pubspec_overrides.yaml +++ /dev/null @@ -1,17 +0,0 @@ -dependency_overrides: - build: - path: ../build - build_config: - path: ../build_config - build_daemon: - path: ../build_daemon - build_resolvers: - path: ../build_resolvers - build_runner: - path: ../build_runner - build_runner_core: - path: ../build_runner_core - build_test: - path: ../build_test - scratch_space: - path: ../scratch_space diff --git a/build_modules/test/fixtures/a/pubspec.yaml b/build_modules/test/fixtures/a/pubspec.yaml index 105067e20..bd55bf09f 100644 --- a/build_modules/test/fixtures/a/pubspec.yaml +++ b/build_modules/test/fixtures/a/pubspec.yaml @@ -1,7 +1,7 @@ name: a - +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dependencies: b: diff --git a/build_modules/test/fixtures/b/pubspec.yaml b/build_modules/test/fixtures/b/pubspec.yaml index 1cb1b1457..8f08d9f04 100644 --- a/build_modules/test/fixtures/b/pubspec.yaml +++ b/build_modules/test/fixtures/b/pubspec.yaml @@ -1,7 +1,7 @@ name: b - +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dependencies: a: diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index 798d1b60f..d17387ca9 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -2,9 +2,10 @@ 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 +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dependencies: analyzer: '>=6.5.0 <7.0.0' diff --git a/build_resolvers/pubspec_overrides.yaml b/build_resolvers/pubspec_overrides.yaml deleted file mode 100644 index 996223833..000000000 --- a/build_resolvers/pubspec_overrides.yaml +++ /dev/null @@ -1,7 +0,0 @@ -dependency_overrides: - build: - path: ../build - build_config: - path: ../build_config - build_test: - path: ../build_test diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml index 157fdeff3..8e8fef9d8 100644 --- a/build_runner/pubspec.yaml +++ b/build_runner/pubspec.yaml @@ -2,9 +2,10 @@ name: build_runner version: 2.4.11-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 environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 platforms: linux: diff --git a/build_runner/pubspec_overrides.yaml b/build_runner/pubspec_overrides.yaml deleted file mode 100644 index 372ed42a6..000000000 --- a/build_runner/pubspec_overrides.yaml +++ /dev/null @@ -1,19 +0,0 @@ -dependency_overrides: - build: - path: ../build - build_config: - path: ../build_config - build_daemon: - path: ../build_daemon - build_modules: - path: ../build_modules - build_resolvers: - path: ../build_resolvers - build_runner_core: - path: ../build_runner_core - build_test: - path: ../build_test - build_web_compilers: - path: ../build_web_compilers - scratch_space: - path: ../scratch_space diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml index 1a6776059..f87336936 100644 --- a/build_runner_core/pubspec.yaml +++ b/build_runner_core/pubspec.yaml @@ -2,9 +2,10 @@ name: build_runner_core version: 7.3.1-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 +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 platforms: linux: diff --git a/build_runner_core/pubspec_overrides.yaml b/build_runner_core/pubspec_overrides.yaml deleted file mode 100644 index 0a42a95c4..000000000 --- a/build_runner_core/pubspec_overrides.yaml +++ /dev/null @@ -1,17 +0,0 @@ -dependency_overrides: - build: - path: ../build - build_config: - path: ../build_config - build_daemon: - path: ../build_daemon - build_modules: - path: ../build_modules - build_resolvers: - path: ../build_resolvers - build_runner: - path: ../build_runner - build_test: - path: ../build_test - scratch_space: - path: ../scratch_space diff --git a/build_test/pubspec.yaml b/build_test/pubspec.yaml index e7937903d..70bb2d4f8 100644 --- a/build_test/pubspec.yaml +++ b/build_test/pubspec.yaml @@ -2,9 +2,10 @@ name: build_test description: Utilities for writing unit tests of Builders. version: 2.2.3-wip repository: https://github.com/dart-lang/build/tree/master/build_test +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dependencies: async: ^2.5.0 diff --git a/build_test/pubspec_overrides.yaml b/build_test/pubspec_overrides.yaml deleted file mode 100644 index f44df59da..000000000 --- a/build_test/pubspec_overrides.yaml +++ /dev/null @@ -1,7 +0,0 @@ -dependency_overrides: - build: - path: ../build - build_config: - path: ../build_config - build_resolvers: - path: ../build_resolvers diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml index b7e49f8d8..a5f63733e 100644 --- a/build_web_compilers/pubspec.yaml +++ b/build_web_compilers/pubspec.yaml @@ -2,9 +2,10 @@ name: build_web_compilers version: 4.0.11-wip description: Builder implementations wrapping the dart2js and DDC compilers. repository: https://github.com/dart-lang/build/tree/master/build_web_compilers +resolution: workspace environment: - sdk: '>=3.1.0 <3.6.0' + sdk: '>=3.5.0-0 <3.6.0' dependencies: analyzer: '>=5.1.0 <7.0.0' @@ -25,12 +26,12 @@ dependencies: stack_trace: ^1.10.0 dev_dependencies: - a: - path: test/fixtures/a - b: - path: test/fixtures/b build_runner: ^2.0.0 build_test: ^2.0.0 + c: + path: test/fixtures/c + d: + path: test/fixtures/d dart_flutter_team_lints: ^3.1.0 test: ^1.16.0 diff --git a/build_web_compilers/pubspec_overrides.yaml b/build_web_compilers/pubspec_overrides.yaml deleted file mode 100644 index a09d8d9a3..000000000 --- a/build_web_compilers/pubspec_overrides.yaml +++ /dev/null @@ -1,19 +0,0 @@ -dependency_overrides: - build: - path: ../build - build_config: - path: ../build_config - build_daemon: - path: ../build_daemon - 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 - scratch_space: - path: ../scratch_space diff --git a/build_web_compilers/test/fixtures/a/lib/a_cycle.dart b/build_web_compilers/test/fixtures/a/lib/a_cycle.dart deleted file mode 100644 index dc033a901..000000000 --- a/build_web_compilers/test/fixtures/a/lib/a_cycle.dart +++ /dev/null @@ -1,5 +0,0 @@ -// ignore_for_file: unused_import -import 'package:b/b_cycle_with_a.dart'; -import 'a_secondary_in_cycle.dart'; - -part 'a_part_in_cycle.dart'; diff --git a/build_web_compilers/test/fixtures/a/lib/a_cycle_with_b.dart b/build_web_compilers/test/fixtures/a/lib/a_cycle_with_b.dart deleted file mode 100644 index 02289ee01..000000000 --- a/build_web_compilers/test/fixtures/a/lib/a_cycle_with_b.dart +++ /dev/null @@ -1,2 +0,0 @@ -// ignore: unused_import -import 'package:b/b_cycle_with_a.dart'; diff --git a/build_web_compilers/test/fixtures/a/lib/a_part_in_cycle.dart b/build_web_compilers/test/fixtures/a/lib/a_part_in_cycle.dart deleted file mode 100644 index 3fcf196eb..000000000 --- a/build_web_compilers/test/fixtures/a/lib/a_part_in_cycle.dart +++ /dev/null @@ -1 +0,0 @@ -part of 'a_cycle.dart'; diff --git a/build_web_compilers/test/fixtures/a/pubspec.yaml b/build_web_compilers/test/fixtures/a/pubspec.yaml deleted file mode 100644 index 105067e20..000000000 --- a/build_web_compilers/test/fixtures/a/pubspec.yaml +++ /dev/null @@ -1,8 +0,0 @@ -name: a - -environment: - sdk: ^3.4.0 - -dependencies: - b: - path: ../b diff --git a/build_web_compilers/test/fixtures/b/lib/b_cycle_with_a.dart b/build_web_compilers/test/fixtures/b/lib/b_cycle_with_a.dart deleted file mode 100644 index f4189aad1..000000000 --- a/build_web_compilers/test/fixtures/b/lib/b_cycle_with_a.dart +++ /dev/null @@ -1,2 +0,0 @@ -// ignore: unused_import -import 'package:a/a_cycle_with_b.dart'; diff --git a/build_web_compilers/test/fixtures/b/pubspec.yaml b/build_web_compilers/test/fixtures/b/pubspec.yaml deleted file mode 100644 index 1cb1b1457..000000000 --- a/build_web_compilers/test/fixtures/b/pubspec.yaml +++ /dev/null @@ -1,8 +0,0 @@ -name: b - -environment: - sdk: ^3.4.0 - -dependencies: - a: - path: ../a diff --git a/build_web_compilers/test/fixtures/c/lib/c_cycle.dart b/build_web_compilers/test/fixtures/c/lib/c_cycle.dart new file mode 100644 index 000000000..52807bb25 --- /dev/null +++ b/build_web_compilers/test/fixtures/c/lib/c_cycle.dart @@ -0,0 +1,5 @@ +// ignore_for_file: unused_import +import 'package:d/d_cycle_with_c.dart'; +import 'c_secondary_in_cycle.dart'; + +part 'c_part_in_cycle.dart'; diff --git a/build_web_compilers/test/fixtures/c/lib/c_cycle_with_d.dart b/build_web_compilers/test/fixtures/c/lib/c_cycle_with_d.dart new file mode 100644 index 000000000..0c2e4564f --- /dev/null +++ b/build_web_compilers/test/fixtures/c/lib/c_cycle_with_d.dart @@ -0,0 +1,2 @@ +// ignore: unused_import +import 'package:d/d_cycle_with_c.dart'; diff --git a/build_web_compilers/test/fixtures/a/lib/a_no_cycle.dart b/build_web_compilers/test/fixtures/c/lib/c_no_cycle.dart similarity index 100% rename from build_web_compilers/test/fixtures/a/lib/a_no_cycle.dart rename to build_web_compilers/test/fixtures/c/lib/c_no_cycle.dart diff --git a/build_web_compilers/test/fixtures/c/lib/c_part_in_cycle.dart b/build_web_compilers/test/fixtures/c/lib/c_part_in_cycle.dart new file mode 100644 index 000000000..691a6b5b4 --- /dev/null +++ b/build_web_compilers/test/fixtures/c/lib/c_part_in_cycle.dart @@ -0,0 +1 @@ +part of 'c_cycle.dart'; diff --git a/build_web_compilers/test/fixtures/a/lib/a_secondary_in_cycle.dart b/build_web_compilers/test/fixtures/c/lib/c_secondary_in_cycle.dart similarity index 52% rename from build_web_compilers/test/fixtures/a/lib/a_secondary_in_cycle.dart rename to build_web_compilers/test/fixtures/c/lib/c_secondary_in_cycle.dart index 3004a5e7e..6a9c3bf38 100644 --- a/build_web_compilers/test/fixtures/a/lib/a_secondary_in_cycle.dart +++ b/build_web_compilers/test/fixtures/c/lib/c_secondary_in_cycle.dart @@ -1,2 +1,2 @@ // ignore: unused_import -import 'a_cycle.dart'; +import 'c_cycle.dart'; diff --git a/build_web_compilers/test/fixtures/c/pubspec.yaml b/build_web_compilers/test/fixtures/c/pubspec.yaml new file mode 100644 index 000000000..87423641b --- /dev/null +++ b/build_web_compilers/test/fixtures/c/pubspec.yaml @@ -0,0 +1,9 @@ +name: c +resolution: workspace + +environment: + sdk: ^3.5.0-0 + +dependencies: + d: + path: ../d diff --git a/build_web_compilers/test/fixtures/d/lib/d_cycle_with_c.dart b/build_web_compilers/test/fixtures/d/lib/d_cycle_with_c.dart new file mode 100644 index 000000000..9cf7a2d25 --- /dev/null +++ b/build_web_compilers/test/fixtures/d/lib/d_cycle_with_c.dart @@ -0,0 +1,2 @@ +// ignore: unused_import +import 'package:c/c_cycle_with_d.dart'; diff --git a/build_web_compilers/test/fixtures/d/pubspec.yaml b/build_web_compilers/test/fixtures/d/pubspec.yaml new file mode 100644 index 000000000..7837135ad --- /dev/null +++ b/build_web_compilers/test/fixtures/d/pubspec.yaml @@ -0,0 +1,9 @@ +name: d +resolution: workspace + +environment: + sdk: ^3.5.0-0 + +dependencies: + c: + path: ../c diff --git a/example/pubspec.yaml b/example/pubspec.yaml index f84ad7fad..aa71b2c2f 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,7 +1,8 @@ name: example publish_to: none environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 +resolution: workspace dependencies: analyzer: ">=5.0.0 <7.0.0" @@ -13,8 +14,3 @@ dev_dependencies: build_runner: ^2.0.0 build_web_compilers: ^4.0.0 dart_flutter_team_lints: ^3.1.0 - -# TODO: Remove once build_modules version 5.0.6 is published. -dependency_overrides: - build_modules: - path: ../build_modules diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 000000000..9995dd561 --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,24 @@ +name: _ # Can be anything, _ by convention. +environment: + sdk: ^3.5.0-0 # Must be ^3.5.0 or later for workspace to be allowed +workspace: +- _test +- _test/pkgs/provides_builder +- _test_common +- analysis +- build +- build_config +- build_daemon +- build_modules +- build_resolvers +- build_runner +- build_runner_core +- build_test +- 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 diff --git a/scratch_space/pubspec.yaml b/scratch_space/pubspec.yaml index 292198921..98e878e00 100644 --- a/scratch_space/pubspec.yaml +++ b/scratch_space/pubspec.yaml @@ -2,13 +2,14 @@ name: scratch_space version: 1.0.3-wip description: A tool to manage running external executables within package:build. repository: https://github.com/dart-lang/build/tree/master/scratch_space +resolution: workspace topics: - build-runner - codegen environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dependencies: build: ^2.0.0 diff --git a/scratch_space/pubspec_overrides.yaml b/scratch_space/pubspec_overrides.yaml deleted file mode 100644 index 2411a6dd3..000000000 --- a/scratch_space/pubspec_overrides.yaml +++ /dev/null @@ -1,17 +0,0 @@ -dependency_overrides: - build: - path: ../build - build_config: - path: ../build_config - build_daemon: - path: ../build_daemon - 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 diff --git a/tool/pubspec.yaml b/tool/pubspec.yaml index 806a5da60..2c34fbb65 100644 --- a/tool/pubspec.yaml +++ b/tool/pubspec.yaml @@ -1,9 +1,10 @@ publish_to: none name: build_development_tools description: Collection of scripts used during development of build packages. +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-0 dependencies: path: ^1.8.0 From f79479d6f03f116da4416955f85a9973d89f44c3 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Fri, 14 Jun 2024 18:29:56 +0000 Subject: [PATCH 02/14] migrate from whereNotNull to nonNulls --- build_runner_core/lib/src/changes/build_script_updates.dart | 2 +- build_runner_core/lib/src/environment/create_merged_dir.dart | 4 +--- build_web_compilers/web/source_map_stack_trace.dart | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build_runner_core/lib/src/changes/build_script_updates.dart b/build_runner_core/lib/src/changes/build_script_updates.dart index ce0ae4d89..8676f9a62 100644 --- a/build_runner_core/lib/src/changes/build_script_updates.dart +++ b/build_runner_core/lib/src/changes/build_script_updates.dart @@ -51,7 +51,7 @@ class _MirrorBuildScriptUpdates implements BuildScriptUpdates { try { allSources = _urisForThisScript .map((id) => idForUri(id, packageGraph)) - .whereNotNull() + .nonNulls .toSet(); var missing = allSources.firstWhereOrNull((id) => !graph.contains(id)); if (missing != null) { diff --git a/build_runner_core/lib/src/environment/create_merged_dir.dart b/build_runner_core/lib/src/environment/create_merged_dir.dart index 0957d6147..0b5d436b6 100644 --- a/build_runner_core/lib/src/environment/create_merged_dir.dart +++ b/build_runner_core/lib/src/environment/create_merged_dir.dart @@ -7,7 +7,6 @@ import 'dart:convert'; import 'dart:io'; import 'package:build/build.dart'; -import 'package:collection/collection.dart'; import 'package:logging/logging.dart'; import 'package:path/path.dart' as p; import 'package:pool/pool.dart'; @@ -74,8 +73,7 @@ Future createMergedOutputDirectories( Set _conflicts(Set buildDirs) { final seen = {}; final conflicts = {}; - var outputLocations = - buildDirs.map((d) => d.outputLocation?.path).whereNotNull(); + var outputLocations = buildDirs.map((d) => d.outputLocation?.path).nonNulls; for (var location in outputLocations) { if (!seen.add(location)) conflicts.add(location); } diff --git a/build_web_compilers/web/source_map_stack_trace.dart b/build_web_compilers/web/source_map_stack_trace.dart index 1717cd36c..ec5ea8f21 100644 --- a/build_web_compilers/web/source_map_stack_trace.dart +++ b/build_web_compilers/web/source_map_stack_trace.dart @@ -8,7 +8,6 @@ // This is forked from the equivalent file that ships with the SDK which is // intended for use within bazel only. -import 'package:collection/collection.dart'; import 'package:path/path.dart' as p; import 'package:source_maps/source_maps.dart'; import 'package:stack_trace/stack_trace.dart'; @@ -71,7 +70,7 @@ StackTrace mapStackTrace(Mapping sourceMap, StackTrace stackTrace, return Frame(Uri.parse(sourceUrl), span.start.line + 1, span.start.column + 1, _prettifyMember(frame.member!)); - }).whereNotNull()) + }).nonNulls) .foldFrames((Frame frame) => frame.uri.scheme.contains('dart')); } From 48bc2d956a38b10cc4396293ad49f05526298b22 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Fri, 14 Jun 2024 18:37:26 +0000 Subject: [PATCH 03/14] re-run mono_repo generate --- .github/workflows/dart.yml | 104 ++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index e82dba886..24f1eb42e 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -40,23 +40,23 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_and_format; linux; Dart 3.4.0; PKG: build; `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.5.0-0; PKG: build; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build;commands:analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build;commands:analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -70,23 +70,23 @@ jobs: if: "always() && steps.build_pub_upgrade.conclusion == 'success'" working-directory: build job_003: - name: "analyze_and_format; linux; Dart 3.4.0; PKGS: build_resolvers, build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.5.0-0; PKGS: build_resolvers, build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build_resolvers-build_test-example-scratch_space;commands:format-analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_resolvers-build_test-example-scratch_space;commands:format-analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build_resolvers-build_test-example-scratch_space - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_resolvers-build_test-example-scratch_space + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -427,23 +427,23 @@ jobs: if: "always() && steps.build_web_compilers_pub_upgrade.conclusion == 'success'" working-directory: build_web_compilers job_009: - name: "unit_test; linux; Dart 3.4.0; PKG: build; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-0; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -466,23 +466,23 @@ jobs: - job_007 - job_008 job_010: - name: "unit_test; linux; Dart 3.4.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build_daemon;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_daemon;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build_daemon - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_daemon + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -505,23 +505,23 @@ jobs: - job_007 - job_008 job_011: - name: "unit_test; linux; Dart 3.4.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build_resolvers;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_resolvers;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build_resolvers - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -544,23 +544,23 @@ jobs: - job_007 - job_008 job_012: - name: "unit_test; linux; Dart 3.4.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build_runner_core;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_runner_core;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build_runner_core - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_runner_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -583,23 +583,23 @@ jobs: - job_007 - job_008 job_013: - name: "unit_test; linux; Dart 3.4.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build_test;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_test;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:build_test - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_test + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -622,23 +622,23 @@ jobs: - job_007 - job_008 job_014: - name: "unit_test; linux; Dart 3.4.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:scratch_space;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:scratch_space;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:scratch_space - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:scratch_space + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1207,13 +1207,13 @@ jobs: - job_007 - job_008 job_029: - name: "unit_test; windows; Dart 3.4.0; PKG: build; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-0; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1236,13 +1236,13 @@ jobs: - job_007 - job_008 job_030: - name: "unit_test; windows; Dart 3.4.0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1265,13 +1265,13 @@ jobs: - job_007 - job_008 job_031: - name: "unit_test; windows; Dart 3.4.0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1294,13 +1294,13 @@ jobs: - job_007 - job_008 job_032: - name: "unit_test; windows; Dart 3.4.0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1323,13 +1323,13 @@ jobs: - job_007 - job_008 job_033: - name: "unit_test; windows; Dart 3.4.0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1352,13 +1352,13 @@ jobs: - job_007 - job_008 job_034: - name: "unit_test; windows; Dart 3.4.0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.4.0" + sdk: "3.5.0-0" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 From f91153b17a62c458de2b6b26a2c95a6d8d7bc031 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Fri, 14 Jun 2024 18:43:26 +0000 Subject: [PATCH 04/14] set a real dev release as the lower constraint --- .github/workflows/dart.yml | 104 +++++++++--------- _test/pkgs/provides_builder/pubspec.yaml | 2 +- _test/pubspec.yaml | 2 +- _test_common/pubspec.yaml | 2 +- analysis/pubspec.yaml | 2 +- build/pubspec.yaml | 2 +- build_config/pubspec.yaml | 2 +- build_daemon/pubspec.yaml | 2 +- build_modules/pubspec.yaml | 2 +- build_modules/test/fixtures/a/pubspec.yaml | 2 +- build_modules/test/fixtures/b/pubspec.yaml | 2 +- build_resolvers/pubspec.yaml | 2 +- build_runner/pubspec.yaml | 2 +- build_runner_core/pubspec.yaml | 2 +- .../fixtures/workspace/pkgs/a/pubspec.yaml | 2 +- .../fixtures/workspace/pkgs/b/pubspec.yaml | 2 +- .../test/fixtures/workspace/pubspec.lock | 2 +- .../test/fixtures/workspace/pubspec.yaml | 2 +- build_test/pubspec.yaml | 2 +- build_web_compilers/pubspec.yaml | 2 +- .../test/fixtures/c/pubspec.yaml | 2 +- .../test/fixtures/d/pubspec.yaml | 2 +- example/pubspec.yaml | 2 +- pubspec.yaml | 2 +- scratch_space/pubspec.yaml | 2 +- tool/pubspec.yaml | 2 +- 26 files changed, 77 insertions(+), 77 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 24f1eb42e..8a72aaa10 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -40,23 +40,23 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_and_format; linux; Dart 3.5.0-0; PKG: build; `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.5.0-254.0.dev; PKG: build; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build;commands:analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build;commands:analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -70,23 +70,23 @@ jobs: if: "always() && steps.build_pub_upgrade.conclusion == 'success'" working-directory: build job_003: - name: "analyze_and_format; linux; Dart 3.5.0-0; PKGS: build_resolvers, build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.5.0-254.0.dev; PKGS: build_resolvers, build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_resolvers-build_test-example-scratch_space;commands:format-analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_resolvers-build_test-example-scratch_space;commands:format-analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_resolvers-build_test-example-scratch_space - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_resolvers-build_test-example-scratch_space + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -427,23 +427,23 @@ jobs: if: "always() && steps.build_web_compilers_pub_upgrade.conclusion == 'success'" working-directory: build_web_compilers job_009: - name: "unit_test; linux; Dart 3.5.0-0; PKG: build; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -466,23 +466,23 @@ jobs: - job_007 - job_008 job_010: - name: "unit_test; linux; Dart 3.5.0-0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_daemon;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_daemon;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_daemon - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_daemon + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -505,23 +505,23 @@ jobs: - job_007 - job_008 job_011: - name: "unit_test; linux; Dart 3.5.0-0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_resolvers;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_resolvers;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_resolvers - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -544,23 +544,23 @@ jobs: - job_007 - job_008 job_012: - name: "unit_test; linux; Dart 3.5.0-0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_runner_core;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_runner_core;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_runner_core - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_runner_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -583,23 +583,23 @@ jobs: - job_007 - job_008 job_013: - name: "unit_test; linux; Dart 3.5.0-0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_test;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_test;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:build_test - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_test + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -622,23 +622,23 @@ jobs: - job_007 - job_008 job_014: - name: "unit_test; linux; Dart 3.5.0-0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:scratch_space;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:scratch_space;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0;packages:scratch_space - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:scratch_space + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1207,13 +1207,13 @@ jobs: - job_007 - job_008 job_029: - name: "unit_test; windows; Dart 3.5.0-0; PKG: build; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1236,13 +1236,13 @@ jobs: - job_007 - job_008 job_030: - name: "unit_test; windows; Dart 3.5.0-0; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1265,13 +1265,13 @@ jobs: - job_007 - job_008 job_031: - name: "unit_test; windows; Dart 3.5.0-0; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1294,13 +1294,13 @@ jobs: - job_007 - job_008 job_032: - name: "unit_test; windows; Dart 3.5.0-0; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1323,13 +1323,13 @@ jobs: - job_007 - job_008 job_033: - name: "unit_test; windows; Dart 3.5.0-0; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1352,13 +1352,13 @@ jobs: - job_007 - job_008 job_034: - name: "unit_test; windows; Dart 3.5.0-0; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-0" + sdk: "3.5.0-254.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 diff --git a/_test/pkgs/provides_builder/pubspec.yaml b/_test/pkgs/provides_builder/pubspec.yaml index 872fc9acd..1671a9314 100644 --- a/_test/pkgs/provides_builder/pubspec.yaml +++ b/_test/pkgs/provides_builder/pubspec.yaml @@ -1,7 +1,7 @@ name: provides_builder resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: build: diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml index 02e370149..7f3b91afa 100644 --- a/_test/pubspec.yaml +++ b/_test/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dev_dependencies: analyzer: any diff --git a/_test_common/pubspec.yaml b/_test_common/pubspec.yaml index 9f7ccdc34..59c482842 100644 --- a/_test_common/pubspec.yaml +++ b/_test_common/pubspec.yaml @@ -4,7 +4,7 @@ description: Test infra for writing build tests. Is not published. resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: build: any diff --git a/analysis/pubspec.yaml b/analysis/pubspec.yaml index 69e570599..36e386a00 100644 --- a/analysis/pubspec.yaml +++ b/analysis/pubspec.yaml @@ -4,6 +4,6 @@ name: _for_analysis_options_only publish_to: none resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dev_dependencies: dart_flutter_team_lints: ^3.1.0 diff --git a/build/pubspec.yaml b/build/pubspec.yaml index 0286fd99d..d2d7c426c 100644 --- a/build/pubspec.yaml +++ b/build/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: analyzer: ">=1.5.0 <7.0.0" diff --git a/build_config/pubspec.yaml b/build_config/pubspec.yaml index 3c3c2f6a1..186504c65 100644 --- a/build_config/pubspec.yaml +++ b/build_config/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_config resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: checked_yaml: ^2.0.0 diff --git a/build_daemon/pubspec.yaml b/build_daemon/pubspec.yaml index ae375ecb9..db35d8b26 100644 --- a/build_daemon/pubspec.yaml +++ b/build_daemon/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_daemon resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: built_collection: ^5.0.0 diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml index 1195e83c0..d74ae45a6 100644 --- a/build_modules/pubspec.yaml +++ b/build_modules/pubspec.yaml @@ -7,7 +7,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_modules resolution: workspace environment: - sdk: '>=3.5.0-0 <3.6.0' + sdk: '>=3.5.0-254.0.dev <3.6.0' dependencies: analyzer: '>=5.1.0 <7.0.0' diff --git a/build_modules/test/fixtures/a/pubspec.yaml b/build_modules/test/fixtures/a/pubspec.yaml index bd55bf09f..bfe105e86 100644 --- a/build_modules/test/fixtures/a/pubspec.yaml +++ b/build_modules/test/fixtures/a/pubspec.yaml @@ -1,7 +1,7 @@ name: a resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: b: diff --git a/build_modules/test/fixtures/b/pubspec.yaml b/build_modules/test/fixtures/b/pubspec.yaml index 8f08d9f04..68ccf5176 100644 --- a/build_modules/test/fixtures/b/pubspec.yaml +++ b/build_modules/test/fixtures/b/pubspec.yaml @@ -1,7 +1,7 @@ name: b resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: a: diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index d17387ca9..f3099d63f 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_resolvers resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: analyzer: '>=6.5.0 <7.0.0' diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml index 8e8fef9d8..e845e7bb2 100644 --- a/build_runner/pubspec.yaml +++ b/build_runner/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_runner resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev platforms: linux: diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml index f87336936..4b35b913c 100644 --- a/build_runner_core/pubspec.yaml +++ b/build_runner_core/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_runner_core resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev platforms: linux: diff --git a/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml b/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml index 1677c6409..0fb4a3aee 100644 --- a/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml +++ b/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml @@ -1,6 +1,6 @@ name: a environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev resolution: workspace dependencies: b: diff --git a/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml b/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml index c22a169a4..4a21c7a27 100644 --- a/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml +++ b/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml @@ -1,4 +1,4 @@ name: b environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev resolution: workspace diff --git a/build_runner_core/test/fixtures/workspace/pubspec.lock b/build_runner_core/test/fixtures/workspace/pubspec.lock index 3630c37dc..4b4d7b69a 100644 --- a/build_runner_core/test/fixtures/workspace/pubspec.lock +++ b/build_runner_core/test/fixtures/workspace/pubspec.lock @@ -2,4 +2,4 @@ # See https://dart.dev/tools/pub/glossary#lockfile packages: {} sdks: - dart: ">=3.5.0-0 <4.0.0" + dart: ">=3.5.0-254.0.dev <4.0.0" diff --git a/build_runner_core/test/fixtures/workspace/pubspec.yaml b/build_runner_core/test/fixtures/workspace/pubspec.yaml index 97e18a7f5..c327a996f 100644 --- a/build_runner_core/test/fixtures/workspace/pubspec.yaml +++ b/build_runner_core/test/fixtures/workspace/pubspec.yaml @@ -1,6 +1,6 @@ name: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev workspace: - pkgs/a - pkgs/b diff --git a/build_test/pubspec.yaml b/build_test/pubspec.yaml index 70bb2d4f8..612a1bb7e 100644 --- a/build_test/pubspec.yaml +++ b/build_test/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_test resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: async: ^2.5.0 diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml index a5f63733e..e6a8fb5db 100644 --- a/build_web_compilers/pubspec.yaml +++ b/build_web_compilers/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_web_compilers resolution: workspace environment: - sdk: '>=3.5.0-0 <3.6.0' + sdk: '>=3.5.0-254.0.dev <3.6.0' dependencies: analyzer: '>=5.1.0 <7.0.0' diff --git a/build_web_compilers/test/fixtures/c/pubspec.yaml b/build_web_compilers/test/fixtures/c/pubspec.yaml index 87423641b..f26a529f0 100644 --- a/build_web_compilers/test/fixtures/c/pubspec.yaml +++ b/build_web_compilers/test/fixtures/c/pubspec.yaml @@ -2,7 +2,7 @@ name: c resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: d: diff --git a/build_web_compilers/test/fixtures/d/pubspec.yaml b/build_web_compilers/test/fixtures/d/pubspec.yaml index 7837135ad..a729ace0a 100644 --- a/build_web_compilers/test/fixtures/d/pubspec.yaml +++ b/build_web_compilers/test/fixtures/d/pubspec.yaml @@ -2,7 +2,7 @@ name: d resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: c: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index aa71b2c2f..9f83b6ed1 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,7 +1,7 @@ name: example publish_to: none environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev resolution: workspace dependencies: diff --git a/pubspec.yaml b/pubspec.yaml index 9995dd561..003f760f0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: _ # Can be anything, _ by convention. environment: - sdk: ^3.5.0-0 # Must be ^3.5.0 or later for workspace to be allowed + sdk: ^3.5.0-254.0.dev # Must be ^3.5.0 or later for workspace to be allowed workspace: - _test - _test/pkgs/provides_builder diff --git a/scratch_space/pubspec.yaml b/scratch_space/pubspec.yaml index 98e878e00..56114ed45 100644 --- a/scratch_space/pubspec.yaml +++ b/scratch_space/pubspec.yaml @@ -9,7 +9,7 @@ topics: - codegen environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: build: ^2.0.0 diff --git a/tool/pubspec.yaml b/tool/pubspec.yaml index 2c34fbb65..52ef72f5b 100644 --- a/tool/pubspec.yaml +++ b/tool/pubspec.yaml @@ -4,7 +4,7 @@ description: Collection of scripts used during development of build packages. resolution: workspace environment: - sdk: ^3.5.0-0 + sdk: ^3.5.0-254.0.dev dependencies: path: ^1.8.0 From 8d79239ead2c0e0cf590c014eb9847b870aa49e3 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Fri, 14 Jun 2024 19:55:10 +0000 Subject: [PATCH 05/14] use a publish dart dev version --- .github/workflows/dart.yml | 104 +++++++++--------- _test/pkgs/provides_builder/pubspec.yaml | 2 +- _test/pubspec.yaml | 2 +- _test_common/pubspec.yaml | 2 +- analysis/pubspec.yaml | 2 +- build/pubspec.yaml | 2 +- build_config/pubspec.yaml | 2 +- build_daemon/pubspec.yaml | 2 +- build_modules/pubspec.yaml | 2 +- build_modules/test/fixtures/a/pubspec.yaml | 2 +- build_modules/test/fixtures/b/pubspec.yaml | 2 +- build_resolvers/pubspec.yaml | 2 +- build_runner/pubspec.yaml | 2 +- build_runner_core/pubspec.yaml | 2 +- .../fixtures/workspace/pkgs/a/pubspec.yaml | 2 +- .../fixtures/workspace/pkgs/b/pubspec.yaml | 2 +- .../test/fixtures/workspace/pubspec.lock | 2 +- .../test/fixtures/workspace/pubspec.yaml | 2 +- build_test/pubspec.yaml | 2 +- build_web_compilers/pubspec.yaml | 2 +- .../test/fixtures/c/pubspec.yaml | 2 +- .../test/fixtures/d/pubspec.yaml | 2 +- example/pubspec.yaml | 2 +- pubspec.yaml | 2 +- scratch_space/pubspec.yaml | 2 +- tool/pubspec.yaml | 2 +- 26 files changed, 77 insertions(+), 77 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 8a72aaa10..1f4ad7159 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -40,23 +40,23 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_and_format; linux; Dart 3.5.0-254.0.dev; PKG: build; `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.5.0-259.0.dev; PKG: build; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build;commands:analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build;commands:analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -70,23 +70,23 @@ jobs: if: "always() && steps.build_pub_upgrade.conclusion == 'success'" working-directory: build job_003: - name: "analyze_and_format; linux; Dart 3.5.0-254.0.dev; PKGS: build_resolvers, build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" + name: "analyze_and_format; linux; Dart 3.5.0-259.0.dev; PKGS: build_resolvers, build_test, example, scratch_space; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_resolvers-build_test-example-scratch_space;commands:format-analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build_resolvers-build_test-example-scratch_space;commands:format-analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_resolvers-build_test-example-scratch_space - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build_resolvers-build_test-example-scratch_space + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -427,23 +427,23 @@ jobs: if: "always() && steps.build_web_compilers_pub_upgrade.conclusion == 'success'" working-directory: build_web_compilers job_009: - name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-259.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -466,23 +466,23 @@ jobs: - job_007 - job_008 job_010: - name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-259.0.dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_daemon;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build_daemon;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_daemon - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build_daemon + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -505,23 +505,23 @@ jobs: - job_007 - job_008 job_011: - name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-259.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_resolvers;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build_resolvers;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_resolvers - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build_resolvers + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -544,23 +544,23 @@ jobs: - job_007 - job_008 job_012: - name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-259.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_runner_core;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build_runner_core;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_runner_core - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build_runner_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -583,23 +583,23 @@ jobs: - job_007 - job_008 job_013: - name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-259.0.dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_test;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build_test;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:build_test - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:build_test + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -622,23 +622,23 @@ jobs: - job_007 - job_008 job_014: - name: "unit_test; linux; Dart 3.5.0-254.0.dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; linux; Dart 3.5.0-259.0.dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:scratch_space;commands:test_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:scratch_space;commands:test_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev;packages:scratch_space - os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-254.0.dev + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:scratch_space + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1207,13 +1207,13 @@ jobs: - job_007 - job_008 job_029: - name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; PKG: build; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1236,13 +1236,13 @@ jobs: - job_007 - job_008 job_030: - name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; PKG: build_daemon; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1265,13 +1265,13 @@ jobs: - job_007 - job_008 job_031: - name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; PKG: build_resolvers; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1294,13 +1294,13 @@ jobs: - job_007 - job_008 job_032: - name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; PKG: build_runner_core; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1323,13 +1323,13 @@ jobs: - job_007 - job_008 job_033: - name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; PKG: build_test; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 @@ -1352,13 +1352,13 @@ jobs: - job_007 - job_008 job_034: - name: "unit_test; windows; Dart 3.5.0-254.0.dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; PKG: scratch_space; `dart test --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.5.0-254.0.dev" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 diff --git a/_test/pkgs/provides_builder/pubspec.yaml b/_test/pkgs/provides_builder/pubspec.yaml index 1671a9314..e433c90d7 100644 --- a/_test/pkgs/provides_builder/pubspec.yaml +++ b/_test/pkgs/provides_builder/pubspec.yaml @@ -1,7 +1,7 @@ name: provides_builder resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: build: diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml index 7f3b91afa..f2982acc2 100644 --- a/_test/pubspec.yaml +++ b/_test/pubspec.yaml @@ -3,7 +3,7 @@ publish_to: none resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dev_dependencies: analyzer: any diff --git a/_test_common/pubspec.yaml b/_test_common/pubspec.yaml index 59c482842..33e1bdef1 100644 --- a/_test_common/pubspec.yaml +++ b/_test_common/pubspec.yaml @@ -4,7 +4,7 @@ description: Test infra for writing build tests. Is not published. resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: build: any diff --git a/analysis/pubspec.yaml b/analysis/pubspec.yaml index 36e386a00..b10c3de25 100644 --- a/analysis/pubspec.yaml +++ b/analysis/pubspec.yaml @@ -4,6 +4,6 @@ name: _for_analysis_options_only publish_to: none resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dev_dependencies: dart_flutter_team_lints: ^3.1.0 diff --git a/build/pubspec.yaml b/build/pubspec.yaml index d2d7c426c..6d656742c 100644 --- a/build/pubspec.yaml +++ b/build/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: analyzer: ">=1.5.0 <7.0.0" diff --git a/build_config/pubspec.yaml b/build_config/pubspec.yaml index 186504c65..b4acb40e4 100644 --- a/build_config/pubspec.yaml +++ b/build_config/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_config resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: checked_yaml: ^2.0.0 diff --git a/build_daemon/pubspec.yaml b/build_daemon/pubspec.yaml index db35d8b26..739fc1268 100644 --- a/build_daemon/pubspec.yaml +++ b/build_daemon/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_daemon resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: built_collection: ^5.0.0 diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml index d74ae45a6..425c4a21a 100644 --- a/build_modules/pubspec.yaml +++ b/build_modules/pubspec.yaml @@ -7,7 +7,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_modules resolution: workspace environment: - sdk: '>=3.5.0-254.0.dev <3.6.0' + sdk: '>=3.5.0-259.0.dev <3.6.0' dependencies: analyzer: '>=5.1.0 <7.0.0' diff --git a/build_modules/test/fixtures/a/pubspec.yaml b/build_modules/test/fixtures/a/pubspec.yaml index bfe105e86..142156e2e 100644 --- a/build_modules/test/fixtures/a/pubspec.yaml +++ b/build_modules/test/fixtures/a/pubspec.yaml @@ -1,7 +1,7 @@ name: a resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: b: diff --git a/build_modules/test/fixtures/b/pubspec.yaml b/build_modules/test/fixtures/b/pubspec.yaml index 68ccf5176..25c39398b 100644 --- a/build_modules/test/fixtures/b/pubspec.yaml +++ b/build_modules/test/fixtures/b/pubspec.yaml @@ -1,7 +1,7 @@ name: b resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: a: diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index f3099d63f..ebce0efa0 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_resolvers resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: analyzer: '>=6.5.0 <7.0.0' diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml index e845e7bb2..cd04e05bc 100644 --- a/build_runner/pubspec.yaml +++ b/build_runner/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_runner resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev platforms: linux: diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml index 4b35b913c..2f9e274c2 100644 --- a/build_runner_core/pubspec.yaml +++ b/build_runner_core/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_runner_core resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev platforms: linux: diff --git a/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml b/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml index 0fb4a3aee..f7a80ee09 100644 --- a/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml +++ b/build_runner_core/test/fixtures/workspace/pkgs/a/pubspec.yaml @@ -1,6 +1,6 @@ name: a environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev resolution: workspace dependencies: b: diff --git a/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml b/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml index 4a21c7a27..c74577984 100644 --- a/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml +++ b/build_runner_core/test/fixtures/workspace/pkgs/b/pubspec.yaml @@ -1,4 +1,4 @@ name: b environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev resolution: workspace diff --git a/build_runner_core/test/fixtures/workspace/pubspec.lock b/build_runner_core/test/fixtures/workspace/pubspec.lock index 4b4d7b69a..f70457999 100644 --- a/build_runner_core/test/fixtures/workspace/pubspec.lock +++ b/build_runner_core/test/fixtures/workspace/pubspec.lock @@ -2,4 +2,4 @@ # See https://dart.dev/tools/pub/glossary#lockfile packages: {} sdks: - dart: ">=3.5.0-254.0.dev <4.0.0" + dart: ">=3.5.0-259.0.dev <4.0.0" diff --git a/build_runner_core/test/fixtures/workspace/pubspec.yaml b/build_runner_core/test/fixtures/workspace/pubspec.yaml index c327a996f..cdf31bd4a 100644 --- a/build_runner_core/test/fixtures/workspace/pubspec.yaml +++ b/build_runner_core/test/fixtures/workspace/pubspec.yaml @@ -1,6 +1,6 @@ name: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev workspace: - pkgs/a - pkgs/b diff --git a/build_test/pubspec.yaml b/build_test/pubspec.yaml index 612a1bb7e..48492f934 100644 --- a/build_test/pubspec.yaml +++ b/build_test/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_test resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: async: ^2.5.0 diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml index e6a8fb5db..6a266db9a 100644 --- a/build_web_compilers/pubspec.yaml +++ b/build_web_compilers/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/build/tree/master/build_web_compilers resolution: workspace environment: - sdk: '>=3.5.0-254.0.dev <3.6.0' + sdk: '>=3.5.0-259.0.dev <3.6.0' dependencies: analyzer: '>=5.1.0 <7.0.0' diff --git a/build_web_compilers/test/fixtures/c/pubspec.yaml b/build_web_compilers/test/fixtures/c/pubspec.yaml index f26a529f0..923ab803e 100644 --- a/build_web_compilers/test/fixtures/c/pubspec.yaml +++ b/build_web_compilers/test/fixtures/c/pubspec.yaml @@ -2,7 +2,7 @@ name: c resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: d: diff --git a/build_web_compilers/test/fixtures/d/pubspec.yaml b/build_web_compilers/test/fixtures/d/pubspec.yaml index a729ace0a..c1eb7475c 100644 --- a/build_web_compilers/test/fixtures/d/pubspec.yaml +++ b/build_web_compilers/test/fixtures/d/pubspec.yaml @@ -2,7 +2,7 @@ name: d resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: c: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 9f83b6ed1..554c418e0 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,7 +1,7 @@ name: example publish_to: none environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev resolution: workspace dependencies: diff --git a/pubspec.yaml b/pubspec.yaml index 003f760f0..147e9590b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: _ # Can be anything, _ by convention. environment: - sdk: ^3.5.0-254.0.dev # Must be ^3.5.0 or later for workspace to be allowed + sdk: ^3.5.0-259.0.dev # Must be ^3.5.0 or later for workspace to be allowed workspace: - _test - _test/pkgs/provides_builder diff --git a/scratch_space/pubspec.yaml b/scratch_space/pubspec.yaml index 56114ed45..55420a985 100644 --- a/scratch_space/pubspec.yaml +++ b/scratch_space/pubspec.yaml @@ -9,7 +9,7 @@ topics: - codegen environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: build: ^2.0.0 diff --git a/tool/pubspec.yaml b/tool/pubspec.yaml index 52ef72f5b..ddb2d4dce 100644 --- a/tool/pubspec.yaml +++ b/tool/pubspec.yaml @@ -4,7 +4,7 @@ description: Collection of scripts used during development of build packages. resolution: workspace environment: - sdk: ^3.5.0-254.0.dev + sdk: ^3.5.0-259.0.dev dependencies: path: ^1.8.0 From 080e51c12cfdcf66221bb3c8cf00657e491a9db6 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Fri, 14 Jun 2024 20:34:34 +0000 Subject: [PATCH 06/14] fix some tests --- _test/test/common/utils.dart | 7 +++++-- build/test/generate/run_builder_test.dart | 4 ++-- .../test/package_graph/package_graph_test.dart | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/_test/test/common/utils.dart b/_test/test/common/utils.dart index 86006e7e4..4c64b7043 100644 --- a/_test/test/common/utils.dart +++ b/_test/test/common/utils.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; +import 'dart:isolate'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; @@ -30,11 +31,13 @@ Future runCommand(List args) => /// build to complete. /// /// To ensure a clean build, set [ensureCleanBuild] to `true`. -Future startServer({bool? ensureCleanBuild, List? buildArgs}) => +Future startServer( + {bool? ensureCleanBuild, List? buildArgs}) async => _startServer( 'dart', [ - '--packages=.dart_tool/package_config.json', + '--packages=', + (await Isolate.packageConfig).toString(), p.join('..', 'build_runner', 'bin', 'build_runner.dart'), 'serve', '--verbose', diff --git a/build/test/generate/run_builder_test.dart b/build/test/generate/run_builder_test.dart index 224745ac3..cea4f79b4 100644 --- a/build/test/generate/run_builder_test.dart +++ b/build/test/generate/run_builder_test.dart @@ -82,7 +82,7 @@ void main() { config.packages.singleWhere((p) => p.name == 'build'); expect(buildPackage.root, Uri.parse('asset:build/')); expect(buildPackage.packageUriRoot, Uri.parse('asset:build/lib/')); - expect(buildPackage.languageVersion, LanguageVersion(3, 4)); + expect(buildPackage.languageVersion, LanguageVersion(3, 5)); final resolvedBuildUri = config.resolve(Uri.parse('package:build/foo.txt'))!; @@ -106,7 +106,7 @@ void main() { Package( 'build', Uri.file('/foo/bar/'), - languageVersion: LanguageVersion(3, 4), + languageVersion: LanguageVersion(3, 5), ), ]), ); diff --git a/build_runner_core/test/package_graph/package_graph_test.dart b/build_runner_core/test/package_graph/package_graph_test.dart index 8dd429814..2a6e8fb1d 100644 --- a/build_runner_core/test/package_graph/package_graph_test.dart +++ b/build_runner_core/test/package_graph/package_graph_test.dart @@ -27,7 +27,7 @@ void main() { final buildRunner = config.packages.singleWhere((p) => p.name == 'build_runner_core'); - expect(buildRunner.languageVersion, LanguageVersion(3, 4)); + expect(buildRunner.languageVersion, LanguageVersion(3, 5)); }); }); From d13a1b62e6d9bab330890b278d6172fc1be22956 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Fri, 14 Jun 2024 20:49:54 +0000 Subject: [PATCH 07/14] read package config from Isolate.packageConfig, fix root package detection --- build_modules/lib/src/scratch_space.dart | 8 ++++++-- .../lib/src/package_graph/package_graph.dart | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build_modules/lib/src/scratch_space.dart b/build_modules/lib/src/scratch_space.dart index 28dca0e50..7831b2d52 100644 --- a/build_modules/lib/src/scratch_space.dart +++ b/build_modules/lib/src/scratch_space.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; +import 'dart:isolate'; import 'dart:math' as math; import 'package:build/build.dart'; @@ -22,7 +23,7 @@ final scratchSpace = ScratchSpace(); /// A shared [Resource] for a [ScratchSpace], which cleans up the contents of /// the [ScratchSpace] in dispose, but doesn't delete it entirely. -final scratchSpaceResource = Resource(() { +final scratchSpaceResource = Resource(() async { if (!scratchSpace.exists) { scratchSpace.tempDir.createSync(recursive: true); scratchSpace.exists = true; @@ -30,7 +31,7 @@ final scratchSpaceResource = Resource(() { var packageConfigFile = File( p.join(scratchSpace.tempDir.path, '.dart_tool', 'package_config.json')); if (!packageConfigFile.existsSync()) { - var originalConfigFile = File(p.join('.dart_tool', 'package_config.json')); + var originalConfigFile = File.fromUri((await Isolate.packageConfig)!); var packageConfigContents = _scratchSpacePackageConfig( originalConfigFile.readAsStringSync(), originalConfigFile.absolute.uri); packageConfigFile @@ -94,6 +95,9 @@ String _scratchSpacePackageConfig(String rootConfig, Uri packageConfigUri) { var foundRoot = false; for (var package in packages) { var rootUri = packageConfigUri.resolve(package['rootUri'] as String); + if (!rootUri.path.endsWith('/') && _currentDirUri.path.endsWith('/')) { + rootUri = rootUri.replace(path: '${rootUri.path}/'); + } // We expect to see exactly one package where the root uri is equal to // the current directory, and that is the current packge. if (rootUri == _currentDirUri) { diff --git a/build_runner_core/lib/src/package_graph/package_graph.dart b/build_runner_core/lib/src/package_graph/package_graph.dart index 3337fd156..3bceae21f 100644 --- a/build_runner_core/lib/src/package_graph/package_graph.dart +++ b/build_runner_core/lib/src/package_graph/package_graph.dart @@ -89,7 +89,6 @@ class PackageGraph { while (true) { packageConfig = await findPackageConfig(Directory(rootDir), recurse: false); - File(p.join(rootDir, '.dart_tool', 'package_config.json')); if (packageConfig != null) { break; } From f70b54dbb5b87054669a886eef06d3b3f291fdb7 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Fri, 14 Jun 2024 20:52:43 +0000 Subject: [PATCH 08/14] add publish_to: none --- pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pubspec.yaml b/pubspec.yaml index 147e9590b..747f53abe 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,7 @@ name: _ # Can be anything, _ by convention. environment: sdk: ^3.5.0-259.0.dev # Must be ^3.5.0 or later for workspace to be allowed +publish_to: none workspace: - _test - _test/pkgs/provides_builder From 21855057b7a77088d2c619b9886395947d52fa67 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Fri, 14 Jun 2024 21:08:33 +0000 Subject: [PATCH 09/14] fix merged directory package config generation to be based on the package graph --- .../src/environment/create_merged_dir.dart | 68 ++++++------------- 1 file changed, 22 insertions(+), 46 deletions(-) diff --git a/build_runner_core/lib/src/environment/create_merged_dir.dart b/build_runner_core/lib/src/environment/create_merged_dir.dart index 0b5d436b6..8f5c39622 100644 --- a/build_runner_core/lib/src/environment/create_merged_dir.dart +++ b/build_runner_core/lib/src/environment/create_merged_dir.dart @@ -124,10 +124,8 @@ Future _createMergedOutputDir( for (var id in builtAssets) _writeAsset( id, outputDir, root, packageGraph, reader, symlinkOnly, hoist), - _writeCustomPackagesFile(packageGraph, outputDir), - if (await reader.canRead(_packageConfigId(packageGraph.root.name))) - _writeModifiedPackageConfig( - packageGraph.root.name, reader, outputDir), + _writeModifiedPackageConfig( + packageGraph.root.name, packageGraph, outputDir), ])); if (!hoist) { @@ -160,22 +158,6 @@ Future _createMergedOutputDir( } } -/// Creates a custom `.packages` file in [outputDir] containing all the -/// packages in [packageGraph]. -/// -/// All package root uris are of the form `packages//`. -Future _writeCustomPackagesFile( - PackageGraph packageGraph, Directory outputDir) async { - var packagesFileContent = - packageGraph.allPackages.keys.map((p) => '$p:packages/$p/').join('\r\n'); - var packagesAsset = AssetId(packageGraph.root.name, '.packages'); - await _writeAsString(outputDir, packagesAsset, packagesFileContent); - return packagesAsset; -} - -AssetId _packageConfigId(String rootPackage) => - AssetId(rootPackage, '.dart_tool/package_config.json'); - /// Creates a modified `.dart_tool/package_config.json` file in [outputDir] /// based on the current one but with modified root and package uris. /// @@ -186,32 +168,26 @@ AssetId _packageConfigId(String rootPackage) => /// /// All other fields are left as is. Future _writeModifiedPackageConfig( - String rootPackage, AssetReader reader, Directory outputDir) async { - var packageConfigAsset = _packageConfigId(rootPackage); - var packageConfig = jsonDecode(await reader.readAsString(packageConfigAsset)) - as Map; - - var version = packageConfig['configVersion'] as int; - if (version != 2) { - throw UnsupportedError( - 'Unsupported package_config.json version, got $version but only ' - 'version 2 is supported.'); - } - var packages = - (packageConfig['packages'] as List).cast>(); - for (var package in packages) { - final name = package['name'] as String; - if (name == rootPackage) { - package['rootUri'] = '../'; - package['packageUri'] = 'packages/${package['name']}'; - } else { - package['rootUri'] = '../packages/${package['name']}'; - package['packageUri'] = ''; - } - } - await _writeAsString( - outputDir, packageConfigAsset, jsonEncode(packageConfig)); - return packageConfigAsset; + String rootPackage, PackageGraph packageGraph, Directory outputDir) async { + var packageConfig = { + 'configVersion': 2, + 'generator': 'build_runner_core', + 'packages': [ + for (var package in packageGraph.allPackages.values) + { + 'name': package.name, + 'rootUri': package.name == rootPackage + ? '../' + : '../packages/${package.name}', + 'packageUri': + package.name == rootPackage ? 'packages/${package.name}' : '', + 'languageVersion': '${package.languageVersion}', + }, + ] + }; + var packageConfigId = AssetId(rootPackage, '.dart_tool/package_config.json'); + await _writeAsString(outputDir, packageConfigId, jsonEncode(packageConfig)); + return packageConfigId; } Set _findRootDirs(Iterable allAssets, String outputPath) { From ae0a2bade52d472dbd037667c5c95bd2dd434922 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Fri, 14 Jun 2024 21:39:31 +0000 Subject: [PATCH 10/14] add package configs for test fixtures and related fixes --- _test_common/lib/package_graphs.dart | 4 ++-- .../lib/src/environment/create_merged_dir.dart | 4 ++-- .../lib/src/package_graph/package_graph.dart | 10 ++-------- .../test/environment/create_merged_dir_test.dart | 11 +++++++---- build_runner_core/test/fixtures/basic_pkg/.packages | 6 ------ build_runner_core/test/fixtures/flutter_pkg/.packages | 9 --------- build_runner_core/test/fixtures/no_pubspec/.packages | 1 - .../test/fixtures/with_dev_deps/.packages | 4 ---- .../test/package_graph/package_graph_test.dart | 2 +- 9 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 build_runner_core/test/fixtures/basic_pkg/.packages delete mode 100644 build_runner_core/test/fixtures/flutter_pkg/.packages delete mode 100644 build_runner_core/test/fixtures/no_pubspec/.packages delete mode 100644 build_runner_core/test/fixtures/with_dev_deps/.packages diff --git a/_test_common/lib/package_graphs.dart b/_test_common/lib/package_graphs.dart index a28bfc2b4..a401d946b 100644 --- a/_test_common/lib/package_graphs.dart +++ b/_test_common/lib/package_graphs.dart @@ -21,10 +21,10 @@ PackageNode package(String packageName, DependencyType? type, LanguageVersion? languageVersion}) => PackageNode(packageName, path ?? '/$packageName', - type ?? DependencyType.path, languageVersion ?? LanguageVersion(0, 0)); + type ?? DependencyType.path, languageVersion); PackageNode rootPackage(String packageName, {String? path, LanguageVersion? languageVersion}) => PackageNode(packageName, path ?? '/$packageName', DependencyType.path, - languageVersion ?? LanguageVersion(0, 0), + languageVersion, isRoot: true); diff --git a/build_runner_core/lib/src/environment/create_merged_dir.dart b/build_runner_core/lib/src/environment/create_merged_dir.dart index 8f5c39622..60b25b98d 100644 --- a/build_runner_core/lib/src/environment/create_merged_dir.dart +++ b/build_runner_core/lib/src/environment/create_merged_dir.dart @@ -171,7 +171,6 @@ Future _writeModifiedPackageConfig( String rootPackage, PackageGraph packageGraph, Directory outputDir) async { var packageConfig = { 'configVersion': 2, - 'generator': 'build_runner_core', 'packages': [ for (var package in packageGraph.allPackages.values) { @@ -181,7 +180,8 @@ Future _writeModifiedPackageConfig( : '../packages/${package.name}', 'packageUri': package.name == rootPackage ? 'packages/${package.name}' : '', - 'languageVersion': '${package.languageVersion}', + if (package.languageVersion != null) + 'languageVersion': '${package.languageVersion}', }, ] }; diff --git a/build_runner_core/lib/src/package_graph/package_graph.dart b/build_runner_core/lib/src/package_graph/package_graph.dart index 3bceae21f..1f4cd474a 100644 --- a/build_runner_core/lib/src/package_graph/package_graph.dart +++ b/build_runner_core/lib/src/package_graph/package_graph.dart @@ -12,13 +12,8 @@ import '../util/constants.dart'; /// The SDK package, we filter this to the core libs and dev compiler /// resources. -final _sdkPackageNode = PackageNode( - r'$sdk', - sdkPath, - DependencyType.hosted, - // A fake language version for the SDK, we don't allow you to read its - // sources anyways, and invalidate the whole build if this changes. - LanguageVersion(0, 0)); +final _sdkPackageNode = + PackageNode(r'$sdk', sdkPath, DependencyType.hosted, null); /// A graph of the package dependencies for an application. class PackageGraph { @@ -104,7 +99,6 @@ class PackageGraph { throw StateError( 'Unable to find package config for package at $packagePath.'); } - final dependencyTypes = _parseDependencyTypes(rootDir); final nodes = {}; diff --git a/build_runner_core/test/environment/create_merged_dir_test.dart b/build_runner_core/test/environment/create_merged_dir_test.dart index 993627a67..06242523d 100644 --- a/build_runner_core/test/environment/create_merged_dir_test.dart +++ b/build_runner_core/test/environment/create_merged_dir_test.dart @@ -55,7 +55,7 @@ void main() { }; final packageGraph = buildPackageGraph({ rootPackage('a'): ['b'], - package('b'): [] + package('b'): [], }); late TargetGraph targetGraph; late Directory tmpDir; @@ -212,7 +212,7 @@ void main() { 'packages/b/c.txt': 'c', 'packages/b/c.txt.copy': 'c', '.dart_tool/package_config.json': - _expectedPackageConfig('a', ['a', 'b']), + _expectedPackageConfig('a', ['a', 'b', r'$sdk']), }; _expectFiles(webFiles, tmpDir); @@ -297,7 +297,7 @@ void main() { 'packages/b/c.txt': 'c', 'web/b.txt': 'b', '.dart_tool/package_config.json': - _expectedPackageConfig('a', ['a', 'b']) + _expectedPackageConfig('a', ['a', 'b', r'$sdk']) }; _expectFiles(expectedFiles, tmpDir); }); @@ -482,7 +482,10 @@ void _expectAllFiles(Directory dir) { 'packages/b/c.txt.copy': 'c', 'web/b.txt': 'b', 'web/b.txt.copy': 'b', - '.dart_tool/package_config.json': _expectedPackageConfig('a', ['a', 'b']) + '.dart_tool/package_config.json': _expectedPackageConfig( + 'a', + ['a', 'b', r'$sdk'], + ) }; _expectFiles(expectedFiles, dir); } diff --git a/build_runner_core/test/fixtures/basic_pkg/.packages b/build_runner_core/test/fixtures/basic_pkg/.packages deleted file mode 100644 index 5383d3dd2..000000000 --- a/build_runner_core/test/fixtures/basic_pkg/.packages +++ /dev/null @@ -1,6 +0,0 @@ -# Generated by hand on 2016-02-01 -a:pkg/a/lib/ -b:pkg/b/lib/ -c:pkg/c/lib/ -d:pkg/d/lib/ -basic_pkg:lib/ diff --git a/build_runner_core/test/fixtures/flutter_pkg/.packages b/build_runner_core/test/fixtures/flutter_pkg/.packages deleted file mode 100644 index cadfb72e3..000000000 --- a/build_runner_core/test/fixtures/flutter_pkg/.packages +++ /dev/null @@ -1,9 +0,0 @@ -# Generated by hand on 2017-02-17. -collection:pkg/collection/lib/ -flutter:sdk/flutter/flutter/lib/ -flutter_driver:sdk/flutter/flutter_driver/lib/ -flutter_gallery_assets:sdk/flutter/flutter_gallery_assets/lib/ -flutter_test:sdk/flutter/flutter_test/lib/ -intl:pkg/intl/lib/ -string_scanner:pkg/string_scanner/lib/ -flutter_gallery:./lib/ \ No newline at end of file diff --git a/build_runner_core/test/fixtures/no_pubspec/.packages b/build_runner_core/test/fixtures/no_pubspec/.packages deleted file mode 100644 index 3fc66548b..000000000 --- a/build_runner_core/test/fixtures/no_pubspec/.packages +++ /dev/null @@ -1 +0,0 @@ -# Created by hand, but empty diff --git a/build_runner_core/test/fixtures/with_dev_deps/.packages b/build_runner_core/test/fixtures/with_dev_deps/.packages deleted file mode 100644 index c9578622f..000000000 --- a/build_runner_core/test/fixtures/with_dev_deps/.packages +++ /dev/null @@ -1,4 +0,0 @@ -# Generated by hand on 2016-03-01 -a:pkg/a/lib/ -b:pkg/b/lib/ -with_dev_deps:lib/ diff --git a/build_runner_core/test/package_graph/package_graph_test.dart b/build_runner_core/test/package_graph/package_graph_test.dart index 2a6e8fb1d..4a3c9195d 100644 --- a/build_runner_core/test/package_graph/package_graph_test.dart +++ b/build_runner_core/test/package_graph/package_graph_test.dart @@ -32,7 +32,7 @@ void main() { }); group('basic package ', () { - var basicPkgPath = 'test/fixtures/basic_pkg'; + var basicPkgPath = 'test/fixtures/basic_pkg/'; setUp(() async { graph = await PackageGraph.forPath(basicPkgPath); From b774e33798cc26a2c5d9ff02012026aae39b8c44 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Fri, 14 Jun 2024 21:45:39 +0000 Subject: [PATCH 11/14] unignore hand coded package configs --- .gitignore | 2 +- .../basic_pkg/.dart_tool/package_config.json | 30 +++++++++++++ .../.dart_tool/package_config.json | 45 +++++++++++++++++++ .../no_pubspec/.dart_tool/package_config.json | 4 ++ .../.dart_tool/package_config.json | 20 +++++++++ 5 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 build_runner_core/test/fixtures/basic_pkg/.dart_tool/package_config.json create mode 100644 build_runner_core/test/fixtures/flutter_pkg/.dart_tool/package_config.json create mode 100644 build_runner_core/test/fixtures/no_pubspec/.dart_tool/package_config.json create mode 100644 build_runner_core/test/fixtures/with_dev_deps/.dart_tool/package_config.json diff --git a/.gitignore b/.gitignore index e7081f519..ccb2152fc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ pubspec.lock /*/build/ # Include .packages files from tests which are hand coded -!build_runner_core/test/fixtures/**/.packages +!build_runner_core/test/fixtures/**/.dart_tool/ !build_runner_core/test/fixtures/**/pubspec.lock # Extra files from dart2js that we don't want diff --git a/build_runner_core/test/fixtures/basic_pkg/.dart_tool/package_config.json b/build_runner_core/test/fixtures/basic_pkg/.dart_tool/package_config.json new file mode 100644 index 000000000..9e1cafe15 --- /dev/null +++ b/build_runner_core/test/fixtures/basic_pkg/.dart_tool/package_config.json @@ -0,0 +1,30 @@ +{ + "configVersion": 2, + "packages": [ + { + "name": "a", + "rootUri": "../pkg/a", + "packageUri": "lib/" + }, + { + "name": "b", + "rootUri": "../pkg/b", + "packageUri": "lib/" + }, + { + "name": "c", + "rootUri": "../pkg/c", + "packageUri": "lib/" + }, + { + "name": "d", + "rootUri": "../pkg/d", + "packageUri": "lib/" + }, + { + "name": "basic_pkg", + "rootUri": "../", + "packageUri": "lib/" + } + ] +} diff --git a/build_runner_core/test/fixtures/flutter_pkg/.dart_tool/package_config.json b/build_runner_core/test/fixtures/flutter_pkg/.dart_tool/package_config.json new file mode 100644 index 000000000..3da8f0b05 --- /dev/null +++ b/build_runner_core/test/fixtures/flutter_pkg/.dart_tool/package_config.json @@ -0,0 +1,45 @@ +{ + "configVersion": 2, + "packages": [ + { + "name": "collection", + "rootUri": "../pkg/collection", + "packageUri": "lib/" + }, + { + "name": "flutter", + "rootUri": "../sdk/flutter/flutter", + "packageUri": "lib/" + }, + { + "name": "flutter_driver", + "rootUri": "../sdk/flutter/flutter_driver", + "packageUri": "lib/" + }, + { + "name": "flutter_gallery_assets", + "rootUri": "../sdk/flutter/flutter_gallery_assets", + "packageUri": "lib/" + }, + { + "name": "flutter_test", + "rootUri": "../sdk/flutter/flutter_test", + "packageUri": "lib/" + }, + { + "name": "intl", + "rootUri": "../pkg/intl", + "packageUri": "lib/" + }, + { + "name": "string_scanner", + "rootUri": "../pkg/string_scanner", + "packageUri": "lib/" + }, + { + "name": "flutter_gallery", + "rootUri": "../", + "packageUri": "lib/" + } + ] +} diff --git a/build_runner_core/test/fixtures/no_pubspec/.dart_tool/package_config.json b/build_runner_core/test/fixtures/no_pubspec/.dart_tool/package_config.json new file mode 100644 index 000000000..170046e51 --- /dev/null +++ b/build_runner_core/test/fixtures/no_pubspec/.dart_tool/package_config.json @@ -0,0 +1,4 @@ +{ + "configVersion": 2, + "packages": [] +} diff --git a/build_runner_core/test/fixtures/with_dev_deps/.dart_tool/package_config.json b/build_runner_core/test/fixtures/with_dev_deps/.dart_tool/package_config.json new file mode 100644 index 000000000..49d03485f --- /dev/null +++ b/build_runner_core/test/fixtures/with_dev_deps/.dart_tool/package_config.json @@ -0,0 +1,20 @@ +{ + "configVersion": 2, + "packages": [ + { + "name": "a", + "rootUri": "../pkg/a", + "packageUri": "lib/" + }, + { + "name": "b", + "rootUri": "../pkg/b", + "packageUri": "lib/" + }, + { + "name": "with_dev_deps", + "rootUri": "../", + "packageUri": "lib/" + } + ] +} From 4c3c7e9bdada40f0fd697436ffa2b88e676d66d8 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 17 Jun 2024 17:27:14 +0000 Subject: [PATCH 12/14] don\'t require a local package config in watch mode --- _test/test/common/utils.dart | 3 +-- build_runner/lib/src/generate/watch_impl.dart | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/_test/test/common/utils.dart b/_test/test/common/utils.dart index 4c64b7043..dd841f40b 100644 --- a/_test/test/common/utils.dart +++ b/_test/test/common/utils.dart @@ -36,8 +36,7 @@ Future startServer( _startServer( 'dart', [ - '--packages=', - (await Isolate.packageConfig).toString(), + '--packages=${(await Isolate.packageConfig).toString()}', p.join('..', 'build_runner', 'bin', 'build_runner.dart'), 'serve', '--verbose', diff --git a/build_runner/lib/src/generate/watch_impl.dart b/build_runner/lib/src/generate/watch_impl.dart index 2d6e3af94..68726c0f8 100644 --- a/build_runner/lib/src/generate/watch_impl.dart +++ b/build_runner/lib/src/generate/watch_impl.dart @@ -332,8 +332,14 @@ class WatchImpl implements BuildState { () async { await logTimedAsync(_logger, 'Waiting for all file watchers to be ready', () => graphWatcher.ready); - originalRootPackageConfigDigest = md5.convert( - await watcherEnvironment.reader.readAsBytes(rootPackageConfigId)); + if (await watcherEnvironment.reader.canRead(rootPackageConfigId)) { + originalRootPackageConfigDigest = md5.convert( + await watcherEnvironment.reader.readAsBytes(rootPackageConfigId)); + } else { + _logger.warning( + 'Root package config not readable, manual restarts will be needed ' + 'after running `pub upgrade`.'); + } BuildResult firstBuild; BuildImpl? build; From d9e2de1ae3d0d5e16385c238286be2f45d3f8045 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 17 Jun 2024 18:25:23 +0000 Subject: [PATCH 13/14] delete analysis dir, move analysis_options to repo root --- _test/analysis_options.yaml | 2 +- _test_common/analysis_options.yaml | 2 +- analysis/pubspec.yaml | 9 --------- analysis/analysis_options.yaml => analysis_options.yaml | 0 build/analysis_options.yaml | 2 +- build_config/analysis_options.yaml | 2 +- build_daemon/analysis_options.yaml | 2 +- build_modules/analysis_options.yaml | 2 +- build_resolvers/analysis_options.yaml | 2 +- build_runner/analysis_options.yaml | 2 +- build_runner_core/analysis_options.yaml | 2 +- build_test/analysis_options.yaml | 2 +- build_web_compilers/analysis_options.yaml | 2 +- example/analysis_options.yaml | 2 +- pubspec.yaml | 5 +++-- scratch_space/analysis_options.yaml | 2 +- tool/analysis_options.yaml | 2 +- 17 files changed, 17 insertions(+), 25 deletions(-) delete mode 100644 analysis/pubspec.yaml rename analysis/analysis_options.yaml => analysis_options.yaml (100%) diff --git a/_test/analysis_options.yaml b/_test/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/_test/analysis_options.yaml +++ b/_test/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/_test_common/analysis_options.yaml b/_test_common/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/_test_common/analysis_options.yaml +++ b/_test_common/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/analysis/pubspec.yaml b/analysis/pubspec.yaml deleted file mode 100644 index b10c3de25..000000000 --- a/analysis/pubspec.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# This file only exists to enable the top level shared analysis_options.yaml -# file to import package:dart_flutter_team_lints. -name: _for_analysis_options_only -publish_to: none -resolution: workspace -environment: - sdk: ^3.5.0-259.0.dev -dev_dependencies: - dart_flutter_team_lints: ^3.1.0 diff --git a/analysis/analysis_options.yaml b/analysis_options.yaml similarity index 100% rename from analysis/analysis_options.yaml rename to analysis_options.yaml diff --git a/build/analysis_options.yaml b/build/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/build/analysis_options.yaml +++ b/build/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/build_config/analysis_options.yaml b/build_config/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/build_config/analysis_options.yaml +++ b/build_config/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/build_daemon/analysis_options.yaml b/build_daemon/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/build_daemon/analysis_options.yaml +++ b/build_daemon/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/build_modules/analysis_options.yaml b/build_modules/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/build_modules/analysis_options.yaml +++ b/build_modules/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/build_resolvers/analysis_options.yaml b/build_resolvers/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/build_resolvers/analysis_options.yaml +++ b/build_resolvers/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/build_runner/analysis_options.yaml b/build_runner/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/build_runner/analysis_options.yaml +++ b/build_runner/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/build_runner_core/analysis_options.yaml b/build_runner_core/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/build_runner_core/analysis_options.yaml +++ b/build_runner_core/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/build_test/analysis_options.yaml b/build_test/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/build_test/analysis_options.yaml +++ b/build_test/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/build_web_compilers/analysis_options.yaml b/build_web_compilers/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/build_web_compilers/analysis_options.yaml +++ b/build_web_compilers/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/pubspec.yaml b/pubspec.yaml index 747f53abe..456cd0e06 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,12 +1,13 @@ -name: _ # Can be anything, _ by convention. +name: build_workspace # Can be anything environment: sdk: ^3.5.0-259.0.dev # Must be ^3.5.0 or later for workspace to be allowed publish_to: none +dev_dependencies: + dart_flutter_team_lints: ^3.1.0 workspace: - _test - _test/pkgs/provides_builder - _test_common -- analysis - build - build_config - build_daemon diff --git a/scratch_space/analysis_options.yaml b/scratch_space/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/scratch_space/analysis_options.yaml +++ b/scratch_space/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml diff --git a/tool/analysis_options.yaml b/tool/analysis_options.yaml index e0815af9d..5e2133eb6 100644 --- a/tool/analysis_options.yaml +++ b/tool/analysis_options.yaml @@ -1 +1 @@ -include: ../analysis/analysis_options.yaml +include: ../analysis_options.yaml From 2eccecc93a886313bc813c32a859e88180b445c4 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 17 Jun 2024 18:29:19 +0000 Subject: [PATCH 14/14] drop dart_flutter_team_lints from sub-packages, it is only needed in the root now --- _test/pubspec.yaml | 1 - _test_common/pubspec.yaml | 3 --- build/pubspec.yaml | 1 - build_config/pubspec.yaml | 1 - build_daemon/pubspec.yaml | 1 - build_modules/pubspec.yaml | 1 - build_resolvers/pubspec.yaml | 1 - build_runner/pubspec.yaml | 1 - build_runner_core/pubspec.yaml | 1 - build_test/pubspec.yaml | 1 - build_web_compilers/pubspec.yaml | 1 - example/pubspec.yaml | 1 - scratch_space/pubspec.yaml | 1 - tool/pubspec.yaml | 1 - 14 files changed, 16 deletions(-) diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml index f2982acc2..7167f04c7 100644 --- a/_test/pubspec.yaml +++ b/_test/pubspec.yaml @@ -15,7 +15,6 @@ dev_dependencies: build_runner_core: any build_test: any build_web_compilers: any - dart_flutter_team_lints: ^3.1.0 io: ^1.0.0 path: ^1.8.0 provides_builder: diff --git a/_test_common/pubspec.yaml b/_test_common/pubspec.yaml index 33e1bdef1..31a8ee556 100644 --- a/_test_common/pubspec.yaml +++ b/_test_common/pubspec.yaml @@ -19,6 +19,3 @@ dependencies: test: ^1.16.0 test_descriptor: ^2.0.0 watcher: ^1.0.0 - -dev_dependencies: - dart_flutter_team_lints: ^3.1.0 diff --git a/build/pubspec.yaml b/build/pubspec.yaml index 6d656742c..70869b13f 100644 --- a/build/pubspec.yaml +++ b/build/pubspec.yaml @@ -21,7 +21,6 @@ dependencies: dev_dependencies: build_resolvers: ^2.4.0 build_test: ^2.0.0 - dart_flutter_team_lints: ^3.1.0 test: ^1.16.0 topics: diff --git a/build_config/pubspec.yaml b/build_config/pubspec.yaml index b4acb40e4..b62fe7009 100644 --- a/build_config/pubspec.yaml +++ b/build_config/pubspec.yaml @@ -17,7 +17,6 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 - dart_flutter_team_lints: ^3.1.0 json_serializable: ^6.0.0 term_glyph: ^1.2.0 test: ^1.16.0 diff --git a/build_daemon/pubspec.yaml b/build_daemon/pubspec.yaml index 98ff1f8a4..7bf6df8cd 100644 --- a/build_daemon/pubspec.yaml +++ b/build_daemon/pubspec.yaml @@ -26,7 +26,6 @@ dev_dependencies: build_runner: ^2.0.0 # TODO: untangle analyzer dependency built_value_generator: ^8.1.0 - dart_flutter_team_lints: ^3.1.0 mockito: ^5.0.0 test: ^1.25.5 test_descriptor: ^2.0.0 diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml index 425c4a21a..3bbf7ed54 100644 --- a/build_modules/pubspec.yaml +++ b/build_modules/pubspec.yaml @@ -33,7 +33,6 @@ dev_dependencies: # Used inside tests build_runner: ^2.0.0 build_test: ^2.0.0 - dart_flutter_team_lints: ^3.1.0 json_serializable: ^6.0.0 test: ^1.16.0 diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index 0ab860aa2..4a15a0c7a 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -25,7 +25,6 @@ dependencies: dev_dependencies: build_test: ^2.0.0 - dart_flutter_team_lints: ^3.1.0 test: ^1.16.0 topics: diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml index e928342e5..8d92660a4 100644 --- a/build_runner/pubspec.yaml +++ b/build_runner/pubspec.yaml @@ -53,7 +53,6 @@ dev_dependencies: path: ../_test_common build_test: ^2.0.0 build_web_compilers: ^4.0.0 - dart_flutter_team_lints: ^3.1.0 stream_channel: ^2.0.0 test: ^1.25.5 test_descriptor: ^2.0.0 diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml index 18069b65d..66ab8aea0 100644 --- a/build_runner_core/pubspec.yaml +++ b/build_runner_core/pubspec.yaml @@ -38,7 +38,6 @@ dev_dependencies: analyzer: '>=5.2.0 <7.0.0' build_runner: ^2.0.0 build_test: ^2.0.0 - dart_flutter_team_lints: ^3.1.0 json_serializable: ^6.0.0 test: ^1.16.0 test_descriptor: ^2.0.0 diff --git a/build_test/pubspec.yaml b/build_test/pubspec.yaml index 48492f934..cf63e1561 100644 --- a/build_test/pubspec.yaml +++ b/build_test/pubspec.yaml @@ -27,7 +27,6 @@ dependencies: dev_dependencies: analyzer: '>=5.2.0 <7.0.0' collection: ^1.15.0 - dart_flutter_team_lints: ^3.1.0 topics: - build-runner diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml index 6a266db9a..ec2177261 100644 --- a/build_web_compilers/pubspec.yaml +++ b/build_web_compilers/pubspec.yaml @@ -32,7 +32,6 @@ dev_dependencies: path: test/fixtures/c d: path: test/fixtures/d - dart_flutter_team_lints: ^3.1.0 test: ^1.16.0 topics: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 554c418e0..9866ab93a 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -13,4 +13,3 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 build_web_compilers: ^4.0.0 - dart_flutter_team_lints: ^3.1.0 diff --git a/scratch_space/pubspec.yaml b/scratch_space/pubspec.yaml index 55420a985..cdade61dd 100644 --- a/scratch_space/pubspec.yaml +++ b/scratch_space/pubspec.yaml @@ -20,5 +20,4 @@ dependencies: dev_dependencies: build_runner: ^2.0.0 build_test: ^2.0.0 - dart_flutter_team_lints: ^3.1.0 test: ^1.16.0 diff --git a/tool/pubspec.yaml b/tool/pubspec.yaml index ddb2d4dce..63164f81c 100644 --- a/tool/pubspec.yaml +++ b/tool/pubspec.yaml @@ -12,6 +12,5 @@ dependencies: yaml_edit: ^2.0.1 dev_dependencies: - dart_flutter_team_lints: ^3.1.0 test: ^1.20.1 test_descriptor: ^2.0.0