From 781881d5bb574d105d269fa6e45e5f7cf82b5580 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 14 Apr 2025 09:17:57 +0200 Subject: [PATCH 1/4] Remove transitive dependency on package:macros --- pkgs/code_builder/CHANGELOG.md | 4 ++++ pkgs/code_builder/pubspec.yaml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/code_builder/CHANGELOG.md b/pkgs/code_builder/CHANGELOG.md index 5e5521cfb3..247e40c07f 100644 --- a/pkgs/code_builder/CHANGELOG.md +++ b/pkgs/code_builder/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.10.2 + +* Upgrade `dart_style` and `source_gen` to remove `package:macros` dependency. + ## 4.10.1 * Require Dart `^3.5.0` diff --git a/pkgs/code_builder/pubspec.yaml b/pkgs/code_builder/pubspec.yaml index 9fb58ccc99..839e81456e 100644 --- a/pkgs/code_builder/pubspec.yaml +++ b/pkgs/code_builder/pubspec.yaml @@ -1,5 +1,5 @@ name: code_builder -version: 4.10.1 +version: 4.10.2 description: A fluent, builder-based library for generating valid Dart code. repository: https://github.com/dart-lang/tools/tree/main/pkgs/code_builder issue_tracker: https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Acode_builder @@ -19,6 +19,6 @@ dev_dependencies: build_runner: ^2.0.3 built_value_generator: ^8.0.0 dart_flutter_team_lints: ^3.0.0 - dart_style: ^2.3.7 - source_gen: ^1.0.0 + dart_style: ^3.0.1 + source_gen: ^2.0.0 test: ^1.16.0 From 4ce6e1e41c29d22f9e8b6706ed5d48b74ee367d9 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 14 Apr 2025 09:29:37 +0200 Subject: [PATCH 2/4] Upgrade SDK to 3.6.0 --- .github/workflows/code_builder.yaml | 2 +- pkgs/code_builder/CHANGELOG.md | 1 + pkgs/code_builder/pubspec.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code_builder.yaml b/.github/workflows/code_builder.yaml index 095e3ba51f..04addcdaee 100644 --- a/.github/workflows/code_builder.yaml +++ b/.github/workflows/code_builder.yaml @@ -51,7 +51,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - sdk: [3.5.0, dev] + sdk: [3.6.0, dev] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c diff --git a/pkgs/code_builder/CHANGELOG.md b/pkgs/code_builder/CHANGELOG.md index 247e40c07f..6e8b6ad41e 100644 --- a/pkgs/code_builder/CHANGELOG.md +++ b/pkgs/code_builder/CHANGELOG.md @@ -1,6 +1,7 @@ ## 4.10.2 * Upgrade `dart_style` and `source_gen` to remove `package:macros` dependency. +* Require Dart `^3.6.0` due to the upgrades. ## 4.10.1 diff --git a/pkgs/code_builder/pubspec.yaml b/pkgs/code_builder/pubspec.yaml index 839e81456e..dbc586092e 100644 --- a/pkgs/code_builder/pubspec.yaml +++ b/pkgs/code_builder/pubspec.yaml @@ -5,7 +5,7 @@ repository: https://github.com/dart-lang/tools/tree/main/pkgs/code_builder issue_tracker: https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Acode_builder environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: built_collection: ^5.0.0 From 27ed995c8eaa5ca584b485ffcefa59521ce4417f Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 15 Apr 2025 08:40:33 +0200 Subject: [PATCH 3/4] Update pkgs/code_builder/pubspec.yaml Co-authored-by: Nate Bosch --- pkgs/code_builder/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/code_builder/pubspec.yaml b/pkgs/code_builder/pubspec.yaml index dbc586092e..6bf096579f 100644 --- a/pkgs/code_builder/pubspec.yaml +++ b/pkgs/code_builder/pubspec.yaml @@ -1,5 +1,5 @@ name: code_builder -version: 4.10.2 +version: 4.10.2-wip description: A fluent, builder-based library for generating valid Dart code. repository: https://github.com/dart-lang/tools/tree/main/pkgs/code_builder issue_tracker: https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Acode_builder From 53835ea027599b7bb145086eba968171e326813e Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 15 Apr 2025 08:40:39 +0200 Subject: [PATCH 4/4] Update pkgs/code_builder/CHANGELOG.md Co-authored-by: Nate Bosch --- pkgs/code_builder/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/code_builder/CHANGELOG.md b/pkgs/code_builder/CHANGELOG.md index 6e8b6ad41e..471f72f33d 100644 --- a/pkgs/code_builder/CHANGELOG.md +++ b/pkgs/code_builder/CHANGELOG.md @@ -1,4 +1,4 @@ -## 4.10.2 +## 4.10.2-wip * Upgrade `dart_style` and `source_gen` to remove `package:macros` dependency. * Require Dart `^3.6.0` due to the upgrades.