diff --git a/packages/generator_tests/pubspec.yaml b/packages/generator_tests/pubspec.yaml
index 07da7279..9f6395c7 100644
--- a/packages/generator_tests/pubspec.yaml
+++ b/packages/generator_tests/pubspec.yaml
@@ -19,25 +19,25 @@ version: 1.0.0+1
 
 environment:
   flutter: ">=3.0.0"
-  sdk: ">=3.8.0 <4.0.0"
+  sdk: ">=3.10.0 <4.0.0"
 resolution: workspace
 
 dependencies:
-  build: ^4.0.1
-  source_gen: ^4.1.2
+  build: ^4.0.5
+  source_gen: ^4.2.2
   path: ^1.8.2
   build_runner: ^2.10.1
   code_builder: ^4.11.0
-  dart_style: ^3.1.3
+  dart_style: ^3.1.8
   recase: ^4.1.0
   reactive_forms_annotations:
     path: ../reactive_forms_annotations
   freezed_annotation: ^3.1.0
 
 dev_dependencies:
-  json_serializable:
+  json_serializable: ^6.14.1
   build_test: ^3.4.1
-  freezed: ^3.2.0
+  freezed: ^3.2.6-dev.1
   test: ^1.25.15
   logging: ^1.3.0
   reactive_forms_generator:
diff --git a/packages/reactive_forms_generator/CHANGELOG.md b/packages/reactive_forms_generator/CHANGELOG.md
index 0dbc5add..2eddcf63 100644
--- a/packages/reactive_forms_generator/CHANGELOG.md
+++ b/packages/reactive_forms_generator/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [8.5.0-beta11]
+
+* analyzer 12 compatibility
+* sdk: '>=3.10.0 <4.0.0'
+
 ## [8.5.0-beta10]
 
 * analyzer 10 compatibility
diff --git a/packages/reactive_forms_generator/example/pubspec.yaml b/packages/reactive_forms_generator/example/pubspec.yaml
index b4d2ebf1..7a0c4151 100644
--- a/packages/reactive_forms_generator/example/pubspec.yaml
+++ b/packages/reactive_forms_generator/example/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ^3.8.0
+  sdk: ^3.10.0
   flutter: ">=3.7.0"
 resolution: workspace
 
@@ -31,6 +31,6 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   build_runner: ^2.7.0
-  freezed: ^3.2.0
-  json_serializable: ^6.9.5
+  freezed: ^3.2.6-dev.1
+  json_serializable: ^6.14.1
   flutter_lints: ^6.0.0
\ No newline at end of file
diff --git a/packages/reactive_forms_generator/lib/src/output/rf_annotation_arguments_visitor.dart b/packages/reactive_forms_generator/lib/src/output/rf_annotation_arguments_visitor.dart
index 4fdfd5e0..9ba03bf0 100644
--- a/packages/reactive_forms_generator/lib/src/output/rf_annotation_arguments_visitor.dart
+++ b/packages/reactive_forms_generator/lib/src/output/rf_annotation_arguments_visitor.dart
@@ -135,7 +135,6 @@ extension on ClassBodyImpl {
       final EmptyClassBodyImpl body => EmptyClassBodyImpl(
         semicolon: body.semicolon,
       ),
-      _ => this,
     };
   }
 }
diff --git a/packages/reactive_forms_generator/pubspec.yaml b/packages/reactive_forms_generator/pubspec.yaml
index 03194820..0d3bcb73 100644
--- a/packages/reactive_forms_generator/pubspec.yaml
+++ b/packages/reactive_forms_generator/pubspec.yaml
@@ -2,21 +2,21 @@ name: reactive_forms_generator
 description: Generator for reactive_forms. Generates form classes based on model.
 repository: https://github.com/artflutter/reactive_forms_generator
 
-version: 8.5.0-beta10
+version: 8.5.0-beta11
 
 environment:
-  sdk: ">=3.8.0 <4.0.0"
+  sdk: ">=3.10.0 <4.0.0"
 resolution: workspace
 
 dependencies:
-  build: ^4.0.1
-  source_gen: ^4.1.2
-  analyzer: ^10.0.0
+  build: ^4.0.5
+  source_gen: ^4.2.2
+  analyzer: ^12.0.0
   path: ^1.8.1
   build_runner: ^2.7.0
   code_builder: ^4.10.1
   collection: ">=1.0.0 <2.0.0"
-  dart_style: ^3.0.0
+  dart_style: ^3.1.8
   recase: ^4.1.0
 
 dev_dependencies:
diff --git a/pubspec.lock b/pubspec.lock
index ace6894f..d5ce1c6b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d"
+      sha256: a49d6cf99e8d8e7a8e93668d09ced0bbdb954d0b4fccc2f5f9241c6b87fad95c
       url: "https://pub.dev"
     source: hosted
-    version: "93.0.0"
+    version: "99.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b
+      sha256: "663efa951fb8a45e06f491223a604c93820598f20e6a99c25617a1576065e8b7"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.1"
+    version: "12.1.0"
   ansi_styles:
     dependency: transitive
     description:
@@ -221,10 +221,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2"
+      sha256: a4c1ccfee44c7e75ed80484071a5c142a385345e658fd8bd7c4b5c97e7198f98
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.7"
+    version: "3.1.8"
   dartz:
     dependency: transitive
     description:
@@ -292,10 +292,10 @@ packages:
     dependency: transitive
     description:
       name: freezed
-      sha256: f23ea33b3863f119b58ed1b586e881a46bd28715ddcc4dbc33104524e3434131
+      sha256: "8599ba37236328ff6f97269ecce875d251a367eb2929c9bbf9b811b2ce56c74e"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.5"
+    version: "3.2.6-dev.1"
   freezed_annotation:
     dependency: transitive
     description:
@@ -380,18 +380,18 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8
+      sha256: "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80"
       url: "https://pub.dev"
     source: hosted
-    version: "4.11.0"
+    version: "4.12.0"
   json_serializable:
     dependency: transitive
     description:
       name: json_serializable
-      sha256: "44729f5c45748e6748f6b9a57ab8f7e4336edc8ae41fc295070e3814e616a6c0"
+      sha256: e45aefa0324f08c683caafbb94b72837aa6193c61822799c916e45f4a263113d
       url: "https://pub.dev"
     source: hosted
-    version: "6.13.0"
+    version: "6.14.1"
   leak_tracker:
     dependency: transitive
     description: