diff --git a/.github/workflows/pr-check-annotation.yml b/.github/workflows/pr-check-annotation.yml
index 0e49f47d..1b1a1f54 100644
--- a/.github/workflows/pr-check-annotation.yml
+++ b/.github/workflows/pr-check-annotation.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.35.5
+          flutter-version: 3.38.6
           channel: stable
           cache: true
       - name: Check out repository code
@@ -36,4 +36,4 @@ jobs:
         run: cd packages/reactive_forms_annotations && flutter analyze --no-fatal-infos
 
       - name: reactive_forms_annotations => code formatting
-        run: cd packages/reactive_forms_annotations && dart format --set-exit-if-changed lib
\ No newline at end of file
+        run: cd packages/reactive_forms_annotations && dart format --set-exit-if-changed lib
diff --git a/.github/workflows/pr-check-example.yml b/.github/workflows/pr-check-example.yml
index ac3aeabf..f6265c1e 100644
--- a/.github/workflows/pr-check-example.yml
+++ b/.github/workflows/pr-check-example.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.35.5
+          flutter-version: 3.38.6
           channel: stable
           cache: true
       - name: Check out repository code
@@ -42,4 +42,4 @@ jobs:
       #        run: cd packages/reactive_forms_generator/example && flutter pub get && dart format --set-exit-if-changed lib
 
       - name: reactive_forms_generator => example => test
-        run: cd packages/reactive_forms_generator/example && flutter test
\ No newline at end of file
+        run: cd packages/reactive_forms_generator/example && flutter test
diff --git a/.github/workflows/pr-check-generator-test.yml b/.github/workflows/pr-check-generator-test.yml
index b02569e7..15604103 100644
--- a/.github/workflows/pr-check-generator-test.yml
+++ b/.github/workflows/pr-check-generator-test.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.35.5
+          flutter-version: 3.38.6
           channel: stable
           cache: true
       - name: Check out repository code
@@ -33,4 +33,4 @@ jobs:
         run: melos bs
 
       - name: reactive_forms_generator => Code generation tests
-        run: cd packages/generator_tests && dart test && cd ../
\ No newline at end of file
+        run: cd packages/generator_tests && dart test && cd ../
diff --git a/.github/workflows/pr-check-generator.yml b/.github/workflows/pr-check-generator.yml
index 814e1c5a..aed56859 100644
--- a/.github/workflows/pr-check-generator.yml
+++ b/.github/workflows/pr-check-generator.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.35.5
+          flutter-version: 3.38.6
           channel: stable
           cache: true
       - name: Check out repository code
@@ -36,4 +36,4 @@ jobs:
         run: flutter analyze --no-fatal-infos
 
       - name: code formatting
-        run: dart format --set-exit-if-changed lib
\ No newline at end of file
+        run: dart format --set-exit-if-changed lib
diff --git a/packages/generator_tests/pubspec.yaml b/packages/generator_tests/pubspec.yaml
index d54b792f..ffe25941 100644
--- a/packages/generator_tests/pubspec.yaml
+++ b/packages/generator_tests/pubspec.yaml
@@ -23,12 +23,12 @@ environment:
 resolution: workspace
 
 dependencies:
-  build: ^4.0.1
-  source_gen: ^4.0.1
-  path: ^1.8.2
-  build_runner: ^2.10.1
-  code_builder: ^4.11.0
-  dart_style: ^3.1.2
+  build: ^4.0.4
+  source_gen: ^4.1.2
+  path: ^1.9.1
+  build_runner: ^2.10.5
+  code_builder: ^4.11.1
+  dart_style: ^3.1.3
   recase: ^4.1.0
   reactive_forms_annotations:
     path: ../reactive_forms_annotations
@@ -36,15 +36,10 @@ dependencies:
 
 dev_dependencies:
   json_serializable:
-  build_test: ^3.4.1
-  freezed: ^3.2.0
-  test: ^1.25.15
+  build_test: ^3.5.5
+  freezed: ^3.2.3
+  test: ^1.27.0
   logging: ^1.3.0
   reactive_forms_generator:
     path: ../reactive_forms_generator
   flutter_lints: ^6.0.0
-
-dependency_overrides:
-  analyzer: 8.2.0
-  _fe_analyzer_shared: 89.0.0
-  test_core: 0.6.8
\ No newline at end of file
diff --git a/packages/reactive_forms_annotations/pubspec.yaml b/packages/reactive_forms_annotations/pubspec.yaml
index 42fc5e3e..7e937931 100644
--- a/packages/reactive_forms_annotations/pubspec.yaml
+++ b/packages/reactive_forms_annotations/pubspec.yaml
@@ -9,11 +9,11 @@ environment:
 resolution: workspace
 
 dependencies:
-  reactive_forms: ^17.0.0
+  reactive_forms: ^18.2.2
   collection: ^1.18.0
   logging: ^1.3.0
   flutter:
     sdk: flutter
 
 dev_dependencies:
-  flutter_lints: ^6.0.0
\ No newline at end of file
+  flutter_lints: ^6.0.0
diff --git a/packages/reactive_forms_generator/example/pubspec.yaml b/packages/reactive_forms_generator/example/pubspec.yaml
index f439a447..54750b58 100644
--- a/packages/reactive_forms_generator/example/pubspec.yaml
+++ b/packages/reactive_forms_generator/example/pubspec.yaml
@@ -13,21 +13,21 @@ dependencies:
     sdk: flutter
   reactive_forms_annotations:
     path: ../../reactive_forms_annotations
-  reactive_forms: ^17.0.1
+  reactive_forms: ^18.2.2
   intl: ">=0.19.0 <1.0.0"
   freezed_annotation: ^3.1.0
   dartz: ^0.10.1
   json_annotation: ^4.9.0
   #  reactive_text_field: ^1.0.0
-  equatable: ^2.0.7
-  reactive_forms_lbc: ^4.0.5
+  equatable: ^2.0.8
+  reactive_forms_lbc: ^5.0.3
 
 dev_dependencies:
   reactive_forms_generator:
     path: ../../reactive_forms_generator
   flutter_test:
     sdk: flutter
-  build_runner: ^2.7.0
-  freezed: ^3.2.0
-  json_serializable: ^6.9.5
-  flutter_lints: ^6.0.0
\ No newline at end of file
+  build_runner: ^2.10.5
+  freezed: ^3.2.3
+  json_serializable: ^6.11.2
+  flutter_lints: ^6.0.0
diff --git a/packages/reactive_forms_generator/lib/src/extensions.dart b/packages/reactive_forms_generator/lib/src/extensions.dart
index 2485191d..f1efc002 100644
--- a/packages/reactive_forms_generator/lib/src/extensions.dart
+++ b/packages/reactive_forms_generator/lib/src/extensions.dart
@@ -177,8 +177,7 @@ extension ParameterElementExt on FormalParameterElement {
     final typeParameter = typeArguments.first;
 
     return (typeParameter.element is ClassElement ||
-            typeParameter.element is EnumElement ||
-            typeParameter.element is TypeDefiningElement) &&
+            typeParameter.element is EnumElement) &&
         !typeParameter.element!.hasRfGroupAnnotation;
   }
 
diff --git a/packages/reactive_forms_generator/lib/src/output/x.dart b/packages/reactive_forms_generator/lib/src/output/x.dart
index 11a54549..43c1c119 100644
--- a/packages/reactive_forms_generator/lib/src/output/x.dart
+++ b/packages/reactive_forms_generator/lib/src/output/x.dart
@@ -274,13 +274,7 @@ class ElementDisplayStringBuilder2 extends ElementDisplayStringBuilder {
     _write(element.displayName);
     _writeTypeParameters(element.typeParameters);
     _write(' = ');
-
-    var aliasedElement = element.aliasedElement;
-    if (aliasedElement != null) {
-      aliasedElement.appendTo(this);
-    } else {
-      _writeType(element.aliasedType);
-    }
+    _writeType(element.aliasedType);
   }
 
   void writeTypeParameter(TypeParameterElement element) {
diff --git a/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form.dart b/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form.dart
index b2c62682..f5f34bf1 100644
--- a/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form.dart
+++ b/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form.dart
@@ -44,7 +44,7 @@ class ReactiveForm {
         ),
         Parameter(
           (b) => b
-            ..name = 'onPopInvoked'
+            ..name = 'onPopInvokedWithResult'
             ..toThis = true
             ..named = true,
         ),
@@ -83,10 +83,10 @@ class ReactiveForm {
         ),
         Field(
           (b) => b
-            ..name = 'onPopInvoked'
+            ..name = 'onPopInvokedWithResult'
             ..modifier = FieldModifier.final$
             ..type = const Reference(
-              'void Function(FormGroup formGroup, bool didPop)?',
+              'void Function(FormGroup formGroup, bool didPop, dynamic? result)?',
             ),
         ),
       ])
@@ -145,7 +145,7 @@ class ReactiveForm {
                       stream: form.form.statusChanged,
                       child: ReactiveFormPopScope(
                         canPop: canPop,
-                        onPopInvoked: onPopInvoked,
+                        onPopInvokedWithResult: onPopInvokedWithResult,
                         child: child,
                       ),
                     );
diff --git a/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form_builder.dart b/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form_builder.dart
index a4b05eb2..7f304071 100644
--- a/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form_builder.dart
+++ b/packages/reactive_forms_generator/lib/src/reactive_forms/reactive_form_builder.dart
@@ -70,7 +70,7 @@ class ReactiveFormBuilder {
         ),
         Parameter(
           (b) => b
-            ..name = 'onPopInvoked'
+            ..name = 'onPopInvokedWithResult'
             ..named = true
             ..toThis = true,
         ),
@@ -117,9 +117,9 @@ class ReactiveFormBuilder {
     ),
     Field(
       (b) => b
-        ..name = 'onPopInvoked'
+        ..name = 'onPopInvokedWithResult'
         ..type = const Reference(
-          'void Function(FormGroup formGroup, bool didPop)?',
+          'void Function(FormGroup formGroup, bool didPop, dynamic? result)?',
         )
         ..modifier = FieldModifier.final$,
     ),
@@ -245,12 +245,10 @@ class ReactiveFormBuilder {
                 return ${reactiveForm.className}(
                   key: ObjectKey(_formModel),
                   form: _formModel,
-                  // canPop: widget.canPop,
-                  // onPopInvoked: widget.onPopInvoked,
                   child: ReactiveFormBuilder(
                     form: () => _formModel.form,
                     canPop: widget.canPop,
-                    onPopInvoked: widget.onPopInvoked,
+                    onPopInvokedWithResult: widget.onPopInvokedWithResult,
                     builder: (context, formGroup, child) => widget.builder(context, _formModel, widget.child),
                     child: widget.child,
                   ),
diff --git a/packages/reactive_forms_generator/lib/src/reactive_forms_generator/errors_method.dart b/packages/reactive_forms_generator/lib/src/reactive_forms_generator/errors_method.dart
index 2cc3dd65..0affa9d9 100644
--- a/packages/reactive_forms_generator/lib/src/reactive_forms_generator/errors_method.dart
+++ b/packages/reactive_forms_generator/lib/src/reactive_forms_generator/errors_method.dart
@@ -11,7 +11,7 @@ class ErrorsMethod extends ReactiveFormGeneratorMethod {
       ..name = field.errorsMethodName
       ..lambda = true
       ..type = MethodType.getter
-      ..returns = Reference('Map<String, Object>${field.nullabilitySuffix}')
+      ..returns = Reference('Map<String, dynamic>${field.nullabilitySuffix}')
       ..body = Code('${field.fieldControlName}.errors'),
   );
 }
diff --git a/packages/reactive_forms_generator/lib/src/types.dart b/packages/reactive_forms_generator/lib/src/types.dart
index 3175cee1..7a920df7 100644
--- a/packages/reactive_forms_generator/lib/src/types.dart
+++ b/packages/reactive_forms_generator/lib/src/types.dart
@@ -78,37 +78,41 @@ extension NodeListImplAnnotationImplExt on NodeListImpl<AnnotationImpl> {
   }
 }
 
-extension on Annotatable {
-  Map<String, String> annotationParams1(TypeChecker? typeChecker) {
-    final result = <String, String>{};
-    final annotation = typeChecker?.firstAnnotationOf(this);
-    try {
-      if (annotation != null) {
-        for (final meta in metadata.annotations) {
-          final obj = meta.computeConstantValue()!;
-
-          final isExactlyType = typeChecker?.isExactlyType(obj.type!) ?? false;
-          if (isExactlyType) {
-            final argumentList =
-                (meta as ElementAnnotationImpl).annotationAst.arguments
-                    as ArgumentListImpl;
-            for (var argument in argumentList.arguments) {
-              final argumentNamedExpression = argument as NamedExpressionImpl;
-              result.addEntries([
-                MapEntry(
-                  argumentNamedExpression.name.label.toSource(),
-                  argumentNamedExpression.expression.toSource(),
-                ),
-              ]);
-            }
+Map<String, String> _annotationParamsFromElement(
+  Element element,
+  TypeChecker? typeChecker,
+) {
+  final result = <String, String>{};
+  final annotation = typeChecker?.firstAnnotationOf(element);
+  try {
+    if (annotation != null) {
+      for (final meta in element.metadata.annotations) {
+        final obj = meta.computeConstantValue();
+        if (obj == null) {
+          continue;
+        }
+
+        final isExactlyType = typeChecker?.isExactlyType(obj.type!) ?? false;
+        if (isExactlyType) {
+          final argumentList =
+              (meta as ElementAnnotationImpl).annotationAst.arguments
+                  as ArgumentListImpl;
+          for (var argument in argumentList.arguments) {
+            final argumentNamedExpression = argument as NamedExpressionImpl;
+            result.addEntries([
+              MapEntry(
+                argumentNamedExpression.name.label.toSource(),
+                argumentNamedExpression.expression.toSource(),
+              ),
+            ]);
           }
         }
       }
-
-      return result;
-    } catch (e) {
-      return result;
     }
+
+    return result;
+  } catch (e) {
+    return result;
   }
 }
 
@@ -167,12 +171,7 @@ extension ElementRfExt on Element {
   }
 
   Map<String, String> annotationParams(TypeChecker? typeChecker) {
-    final result = <String, String>{};
-    if (this is Annotatable) {
-      return (this as Annotatable).annotationParams1(typeChecker);
-    }
-
-    return result;
+    return _annotationParamsFromElement(this, typeChecker);
     // final annotation = typeChecker?.firstAnnotationOf(this);
     // try {
     //   if (annotation != null) {
diff --git a/packages/reactive_forms_generator/pubspec.yaml b/packages/reactive_forms_generator/pubspec.yaml
index a17ddf77..92f9ba5f 100644
--- a/packages/reactive_forms_generator/pubspec.yaml
+++ b/packages/reactive_forms_generator/pubspec.yaml
@@ -9,23 +9,18 @@ environment:
 resolution: workspace
 
 dependencies:
-  build: ^4.0.1
-  source_gen: ^4.0.1
-  _fe_analyzer_shared: ^89.0.0
-  analyzer: ^8.2.0
-  path: ^1.8.1
-  build_runner: ^2.7.0
-  code_builder: ^4.10.1
+  build: ^4.0.4
+  source_gen: ^4.1.2
+  _fe_analyzer_shared: ^91.0.0
+  analyzer: ^8.4.0
+  path: ^1.9.1
+  build_runner: ^2.10.5
+  code_builder: ^4.11.1
   collection: ">=1.0.0 <2.0.0"
-  dart_style: ^3.0.0
+  dart_style: ^3.1.3
   recase: ^4.1.0
 
 dev_dependencies:
-  build_test: ^3.4.1
-  logging: ^1.2.0
+  build_test: ^3.5.5
+  logging: ^1.3.0
   flutter_lints: ^6.0.0
-
-#dependency_overrides:
-#  build_resolvers: ^2.1.0
-#  test_api: ^0.4.18
-#  source_helper: ^1.3.3
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index ded7be08..75374475 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -2,21 +2,21 @@
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
   _fe_analyzer_shared:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: dd3d2ad434b9510001d089e8de7556d50c834481b9abc2891a0184a8493a19dc
+      sha256: c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d
       url: "https://pub.dev"
     source: hosted
-    version: "89.0.0"
+    version: "91.0.0"
   analyzer:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: analyzer
-      sha256: c22b6e7726d1f9e5db58c7251606076a71ca0dbcf76116675edfadbec0c9e875
+      sha256: f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "8.4.1"
   ansi_styles:
     dependency: transitive
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: dfb67ccc9a78c642193e0c2d94cb9e48c2c818b3178a86097d644acdcde6a8d9
+      sha256: "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.0.4"
   build_config:
     dependency: transitive
     description:
@@ -69,26 +69,26 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "409002f1adeea601018715d613115cfaf0e31f512cb80ae4534c79867ae2363d"
+      sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.1.1"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: a9461b8e586bf018dd4afd2e13b49b08c6a844a4b226c8d1d10f3a723cdd78c3
+      sha256: b4d854962a32fd9f8efc0b76f98214790b833af8b2e9b2df6bfc927c0415a072
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.1"
+    version: "2.10.5"
   build_test:
     dependency: transitive
     description:
       name: build_test
-      sha256: "86124991e1df069c0993fd1c29dc4e112b73884543f6d9d1d3c2ddb1d6f61dc0"
+      sha256: a788fc4bbdbdcc2de31076596ab34d40f6689e6cf0e31cf82b569296dbdfa3b2
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.1"
+    version: "3.5.5"
   built_collection:
     dependency: transitive
     description:
@@ -101,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d
+      sha256: "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8"
       url: "https://pub.dev"
     source: hosted
-    version: "8.12.0"
+    version: "8.12.3"
   characters:
     dependency: transitive
     description:
@@ -165,10 +165,10 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243"
+      sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d"
       url: "https://pub.dev"
     source: hosted
-    version: "4.11.0"
+    version: "4.11.1"
   collection:
     dependency: transitive
     description:
@@ -221,10 +221,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697
+      sha256: a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
   dartz:
     dependency: transitive
     description:
@@ -237,10 +237,10 @@ packages:
     dependency: transitive
     description:
       name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
+      sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.8"
   fake_async:
     dependency: transitive
     description:
@@ -340,10 +340,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
+      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.6.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -376,14 +376,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.2"
   json_annotation:
     dependency: transitive
     description:
@@ -396,10 +388,10 @@ packages:
     dependency: transitive
     description:
       name: json_serializable
-      sha256: "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe"
+      sha256: c5b2ee75210a0f263c6c7b9eeea80553dbae96ea1bf57f02484e806a3ffdffa3
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.1"
+    version: "6.11.2"
   leak_tracker:
     dependency: transitive
     description:
@@ -484,10 +476,10 @@ packages:
     dependency: transitive
     description:
       name: mustache_template
-      sha256: daa42be75f2ccfb287c24a75e7ac594f2ea0b32bf9ebe7c15154aa45b2dfb2de
+      sha256: "4326d0002ff58c74b9486990ccbdab08157fca3c996fe9e197aff9d61badf307"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   nested:
     dependency: transitive
     description:
@@ -588,18 +580,18 @@ packages:
     dependency: transitive
     description:
       name: reactive_forms
-      sha256: "9b1fb18e0aae9c50cfa0aaabaaa38bc4d78eefc9b7b95fa9c947b051f6524b8e"
+      sha256: b8dcd47f933927a0da76ec366f24377710595596a3253283927c18560a01e902
       url: "https://pub.dev"
     source: hosted
-    version: "17.0.1"
+    version: "18.2.2"
   reactive_forms_lbc:
     dependency: transitive
     description:
       name: reactive_forms_lbc
-      sha256: "908a0a0cacb650838c01a88661836ef11386675a261f6c8f53881896a36ea0ac"
+      sha256: "673aeccbf1b515afa8c2a4252d17f74e13f1e17963f6f05fd442f609ef9e4ef0"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.0.3"
   recase:
     dependency: transitive
     description:
@@ -649,10 +641,10 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "9098ab86015c4f1d8af6486b547b11100e73b193e1899015033cb3e14ad20243"
+      sha256: "585bc140f20da42c584ece2df28f4d9ef2566955332b626f655957b3a8c8ad54"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.2"
   source_helper:
     dependency: transitive
     description:
@@ -729,26 +721,26 @@ packages:
     dependency: transitive
     description:
       name: test
-      sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7"
+      sha256: "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.26.3"
+    version: "1.29.0"
   test_api:
     dependency: "direct overridden"
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.7.7"
   test_core:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: test_core
-      sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa"
+      sha256: "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.8"
+    version: "0.6.15"
   typed_data:
     dependency: transitive
     description:
@@ -777,10 +769,10 @@ packages:
     dependency: transitive
     description:
       name: watcher
-      sha256: "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a"
+      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.4"
+    version: "1.2.1"
   web:
     dependency: transitive
     description:
@@ -833,10 +825,10 @@ packages:
     dependency: transitive
     description:
       name: yaml_edit
-      sha256: fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5
+      sha256: ec709065bb2c911b336853b67f3732dd13e0336bd065cc2f1061d7610ddf45e3
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.3"
 sdks:
   dart: ">=3.9.0 <4.0.0"
-  flutter: ">=3.18.0-18.0.pre.54"
+  flutter: ">=3.29.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 968298c5..20559741 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,8 +10,20 @@ environment:
   sdk: ">=3.8.0 <4.0.0"
 
 dependency_overrides:
-  test_api: 0.7.4
+  test_api: 0.7.7
 
 dev_dependencies:
-  build_runner: ^2.4.15
-  melos: ^7.0.0-dev.7
+  build_runner: ^2.10.5
+  melos: ^7.3.0
+
+melos:
+  scripts:
+    format:
+      exec: dart format .
+    gen:build:
+      run: dart run build_runner build --delete-conflicting-outputs
+      exec:
+        orderDependents: true
+      packageFilters:
+        dependsOn: build_runner
+        ignore: "*example*"