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 5e5521cfb3..471f72f33d 100644
--- a/pkgs/code_builder/CHANGELOG.md
+++ b/pkgs/code_builder/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.10.2-wip
+
+* Upgrade `dart_style` and `source_gen` to remove `package:macros` dependency.
+* Require Dart `^3.6.0` due to the upgrades.
+
 ## 4.10.1
 
 * Require Dart `^3.5.0`
diff --git a/pkgs/code_builder/pubspec.yaml b/pkgs/code_builder/pubspec.yaml
index 9fb58ccc99..6bf096579f 100644
--- a/pkgs/code_builder/pubspec.yaml
+++ b/pkgs/code_builder/pubspec.yaml
@@ -1,11 +1,11 @@
 name: code_builder
-version: 4.10.1
+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
 
 environment:
-  sdk: ^3.5.0
+  sdk: ^3.6.0
 
 dependencies:
   built_collection: ^5.0.0
@@ -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