feat: migrate to analyzer 9.0.0 API

- Replace Element2 API with Element API - Update imports from element2.dart to element.dart - Replace .firstFragment.name2 with .name - Replace .firstFragment.metadata2.annotations with .metadata.annotations - Replace .fields2 with .fields - Replace .methods2 with .methods - Remove duplicate imports in annotation_validator.dart and generated_class.dart - Update test mocks to use Element instead of Element2 All generators now work correctly with analyzer 9.0.0: - melos analyze: SUCCESS (0 issues) - melos codegen: SUCCESS (13 outputs generated) - melos bootstrap: SUCCESS (8 packages)
chore(release): publish packages
2026-03-25 04:40:33 +00:00 · 2026-01-30 10:48:48 +03:00 · 2026-01-29 23:18:12 +03:00 · 2026-01-29 23:17:58 +03:00 · 2026-01-29 23:04:22 +03:00 · 2026-01-29 23:02:37 +03:00
32 changed files with 469 additions and 432 deletions
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.32.0"
+  "flutter": "3.38.1"
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,112 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## 2026-01-29
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - [`cherrypick_annotations` - `v4.0.0-dev.0`](#cherrypick_annotations---v400-dev0)
+ - [`cherrypick_generator` - `v4.0.0-dev.0`](#cherrypick_generator---v400-dev0)
+
+Packages with other changes:
+
+ - There are no other changes in this release.
+
+---
+
+#### `cherrypick_annotations` - `v4.0.0-dev.0`
+
+ - **BREAKING** **FEAT**: update Dart SDK minimum versions.
+
+#### `cherrypick_generator` - `v4.0.0-dev.0`
+
+ - **BREAKING** **FEAT**: update Dart SDK minimum versions.
+
+
+## 2026-01-29
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`cherrypick_annotations` - `v3.0.3`](#cherrypick_annotations---v303)
+ - [`cherrypick_generator` - `v3.0.3`](#cherrypick_generator---v303)
+
+---
+
+#### `cherrypick_annotations` - `v3.0.3`
+
+#### `cherrypick_generator` - `v3.0.3`
+
+
+## 2026-01-29
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`cherrypick_annotations` - `v3.0.2`](#cherrypick_annotations---v302)
+ - [`cherrypick_generator` - `v3.0.2`](#cherrypick_generator---v302)
+
+Packages graduated to a stable release (see pre-releases prior to the stable version for changelog entries):
+
+ - `cherrypick_annotations` - `v3.0.2`
+ - `cherrypick_generator` - `v3.0.2`
+
+---
+
+#### `cherrypick_annotations` - `v3.0.2`
+
+#### `cherrypick_generator` - `v3.0.2`
+
+
+## 2025-10-20
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`cherrypick` - `v3.0.2`](#cherrypick---v302)
+ - [`cherrypick_flutter` - `v3.0.2`](#cherrypick_flutter---v302)
+ - [`talker_cherrypick_logger` - `v3.0.2`](#talker_cherrypick_logger---v302)
+
+Packages with dependency updates only:
+
+> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
+
+ - `cherrypick_flutter` - `v3.0.2`
+ - `talker_cherrypick_logger` - `v3.0.2`
+
+---
+
+#### `cherrypick` - `v3.0.2`
+
+ - **FIX**(test): fix warning.
+ - **FIX**(scope): properly clear binding and module references on dispose.
+
+
 ## 2025-09-09

 ### Changes
--- a/benchmark_di/pubspec.lock
+++ b/benchmark_di/pubspec.lock
@@ -47,7 +47,7 @@ packages:
      path: "../cherrypick"
      relative: true
    source: path
-    version: "3.0.0"
+    version: "3.0.2"
  collection:
    dependency: transitive
    description:
--- a/cherrypick/CHANGELOG.md
+++ b/cherrypick/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 3.0.2
+
+ - **FIX**(test): fix warning.
+ - **FIX**(scope): properly clear binding and module references on dispose.
+
 ## 3.0.1

 - **DOCS**: add Netlify deployment status badge to README files.
--- a/cherrypick/example/pubspec.yaml
+++ b/cherrypick/example/pubspec.yaml
@@ -4,7 +4,7 @@ homepage: localhost
 publish_to: none

 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: '>=3.2.0 <4.0.0'


 dependencies:
--- a/cherrypick/lib/src/binding.dart
+++ b/cherrypick/lib/src/binding.dart
@@ -223,17 +223,17 @@ class Binding<T> {

  @Deprecated('Use toInstance instead of toInstanceAsync')
  Binding<T> toInstanceAsync(Instance<T> value) {
-    return this.toInstance(value);
+    return toInstance(value);
  }

  @Deprecated('Use toProvide instead of toProvideAsync')
  Binding<T> toProvideAsync(Provider<T> value) {
-    return this.toProvide(value);
+    return toProvide(value);
  }

  @Deprecated('Use toProvideWithParams instead of toProvideAsyncWithParams')
  Binding<T> toProvideAsyncWithParams(ProviderWithParams<T> value) {
-    return this.toProvideWithParams(value);
+    return toProvideWithParams(value);
  }

  /// Marks this binding as singleton (will only create and cache one instance per scope).
--- a/cherrypick/lib/src/scope.dart
+++ b/cherrypick/lib/src/scope.dart
@@ -498,5 +498,10 @@ class Scope with CycleDetectionMixin, GlobalCycleDetectionMixin {
      await d.dispose();
    }
    _disposables.clear();
+
+    // Clear modules
+    _modulesList.clear();
+    // Clear binding-index
+    _bindingResolvers.clear();
  }
 }
--- a/cherrypick/pubspec.yaml
+++ b/cherrypick/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cherrypick
 description: Cherrypick is a small dependency injection (DI) library for dart/flutter projects.
-version: 3.0.1
+version: 3.0.2
 homepage: https://cherrypick-di.netlify.app
 documentation: https://cherrypick-di.netlify.app/docs/intro
 repository: https://github.com/pese-git/cherrypick
--- a/cherrypick/test/binding_memory_leak_test.dart
+++ b/cherrypick/test/binding_memory_leak_test.dart
@@ -0,0 +1,65 @@
+import 'dart:async';
+import 'package:cherrypick/cherrypick.dart';
+import 'package:test/test.dart';
+
+class HeavyService implements Disposable {
+  static int instanceCount = 0;
+  HeavyService() {
+    instanceCount++;
+    print('HeavyService created. Instance count: '
+        '\u001b[32m$instanceCount\u001b[0m');
+  }
+
+  @override
+  void dispose() {
+    instanceCount--;
+    print('HeavyService disposed. Instance count: '
+        '\u001b[31m$instanceCount\u001b[0m');
+  }
+
+  static final Finalizer<String> _finalizer = Finalizer((msg) {
+    print('GC FINALIZED HeavyService: $msg');
+  });
+  void registerFinalizer() => _finalizer.attach(this, toString(), detach: this);
+}
+
+class HeavyModule extends Module {
+  @override
+  void builder(Scope scope) {
+    bind<HeavyService>().toProvide(() => HeavyService());
+  }
+}
+
+void main() {
+  test('Binding memory is cleared after closing and reopening scope', () async {
+    final root = CherryPick.openRootScope();
+    for (int i = 0; i < 10; i++) {
+      print('\nIteration $i -------------------------------');
+      final subScope = root.openSubScope('leak-test-scope');
+      subScope.installModules([HeavyModule()]);
+      final service = subScope.resolve<HeavyService>();
+      expect(service, isNotNull);
+      await root.closeSubScope('leak-test-scope');
+      // Dart GC не сразу удаляет освобождённые объекты, добавляем паузу и вызываем GC.
+      await Future.delayed(const Duration(milliseconds: 200));
+    }
+
+    // Если dispose не вызвался, instanceCount > 0 => утечка.
+    expect(HeavyService.instanceCount, equals(0));
+  });
+
+  test('Service is finalized after scope is closed/cleaned', () async {
+    final root = CherryPick.openRootScope();
+    HeavyService? ref;
+    {
+      final sub = root.openSubScope('s');
+      sub.installModules([HeavyModule()]);
+      ref = sub.resolve<HeavyService>();
+      ref.registerFinalizer();
+      expect(HeavyService.instanceCount, 1);
+      await root.closeSubScope('s');
+    }
+    await Future.delayed(const Duration(seconds: 2));
+    expect(HeavyService.instanceCount, 0);
+  });
+}
--- a/cherrypick_annotations/CHANGELOG.md
+++ b/cherrypick_annotations/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 4.0.0-dev.0
+
+> Note: This release has breaking changes.
+
+ - **BREAKING** **FEAT**: update Dart SDK minimum versions.
+
+## 3.0.3
+
+## 3.0.2
+
+ - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+
 ## 3.0.2-dev.0

 - **REFACTOR**(generator): migrate cherrypick_generator to analyzer element2 API.
--- a/cherrypick_annotations/pubspec.yaml
+++ b/cherrypick_annotations/pubspec.yaml
@@ -1,7 +1,7 @@
 name: cherrypick_annotations
 description: |
  Set of annotations for CherryPick dependency injection library. Enables code generation and declarative DI for Dart & Flutter projects.
-version: 3.0.2-dev.0
+version: 4.0.0-dev.0
 homepage: https://cherrypick-di.netlify.app
 documentation: https://cherrypick-di.netlify.app/docs/intro
 repository: https://github.com/pese-git/cherrypick/cherrypick_annotations
@@ -14,7 +14,7 @@ topics:
  - inversion-of-control

 environment:
-  sdk: ">=3.8.0 <4.0.0"
+  sdk: ">=3.9.0 <4.0.0"

 # Add regular dependencies here.
 dependencies:
--- a/cherrypick_flutter/CHANGELOG.md
+++ b/cherrypick_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.2
+
+ - Update a dependency to the latest release.
+
 ## 3.0.1

 - **DOCS**: add Netlify deployment status badge to README files.
--- a/cherrypick_flutter/pubspec.yaml
+++ b/cherrypick_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: cherrypick_flutter
 description: "Flutter library that allows access to the root scope through the context using `CherryPickProvider`."
-version: 3.0.1
+version: 3.0.2
 homepage: https://cherrypick-di.netlify.app
 documentation: https://cherrypick-di.netlify.app/docs/intro
 repository: https://github.com/pese-git/cherrypick
@@ -19,7 +19,7 @@ environment:
 dependencies:
  flutter:
    sdk: flutter
-  cherrypick: ^3.0.1
+  cherrypick: ^3.0.2

 dev_dependencies:
  flutter_test:
--- a/cherrypick_generator/CHANGELOG.md
+++ b/cherrypick_generator/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 4.0.0-dev.0
+
+> Note: This release has breaking changes.
+
+ - **BREAKING** **FEAT**: update Dart SDK minimum versions.
+
+## 3.0.3
+
+## 3.0.2
+
+ - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+
 ## 3.0.2-dev.0

 - **REFACTOR**(generator): migrate cherrypick_generator to analyzer element2 API.
--- a/cherrypick_generator/lib/inject_generator.dart
+++ b/cherrypick_generator/lib/inject_generator.dart
@@ -12,7 +12,7 @@
 //

 import 'package:analyzer/dart/constant/value.dart';
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:build/build.dart';
@@ -100,11 +100,11 @@ class InjectGenerator extends GeneratorForAnnotation<ann.injectable> {
  /// ```
  @override
  dynamic generateForAnnotatedElement(
-    Element2 element,
+    Element element,
    ConstantReader annotation,
    BuildStep buildStep,
  ) {
-    if (element is! ClassElement2) {
+    if (element is! ClassElement) {
      throw InvalidGenerationSourceError(
        '@injectable() can only be applied to classes.',
        element: element,
@@ -112,7 +112,7 @@ class InjectGenerator extends GeneratorForAnnotation<ann.injectable> {
    }

    final classElement = element;
-    final className = classElement.firstFragment.name2;
+    final className = classElement.name;
    final mixinName = '_\$$className';

    final buffer = StringBuffer()
@@ -120,7 +120,7 @@ class InjectGenerator extends GeneratorForAnnotation<ann.injectable> {
      ..writeln('  void _inject($className instance) {');

    // Collect and process all @inject fields
-    final injectFields = classElement.fields2
+    final injectFields = classElement.fields
        .where((f) => _isInjectField(f))
        .map((f) => _parseInjectField(f));

@@ -138,8 +138,8 @@ class InjectGenerator extends GeneratorForAnnotation<ann.injectable> {
  /// Returns true if a field is annotated with `@inject`.
  ///
  /// Used to detect which fields should be processed for injection.
-  static bool _isInjectField(FieldElement2 field) {
-    return field.firstFragment.metadata2.annotations.any(
+  static bool _isInjectField(FieldElement field) {
+    return field.metadata.annotations.any(
      (m) => m.computeConstantValue()?.type?.getDisplayString() == 'inject',
    );
  }
@@ -149,11 +149,11 @@ class InjectGenerator extends GeneratorForAnnotation<ann.injectable> {
  ///
  /// Converts Dart field declaration and all parameterizing injection-related
  /// annotations into a [_ParsedInjectField] which is used for codegen.
-  static _ParsedInjectField _parseInjectField(FieldElement2 field) {
+  static _ParsedInjectField _parseInjectField(FieldElement field) {
    String? scopeName;
    String? namedValue;

-    for (final meta in field.firstFragment.metadata2.annotations) {
+    for (final meta in field.metadata.annotations) {
      final DartObject? obj = meta.computeConstantValue();
      final type = obj?.type?.getDisplayString();
      if (type == 'scope') {
@@ -185,7 +185,7 @@ class InjectGenerator extends GeneratorForAnnotation<ann.injectable> {
            ));

    return _ParsedInjectField(
-      fieldName: field.firstFragment.name2 ?? '',
+      fieldName: field.name!,
      coreType: coreTypeName.replaceAll('?', ''), // удаляем "?" на всякий
      isFuture: isFuture,
      isNullable: isNullable,
--- a/cherrypick_generator/lib/module_generator.dart
+++ b/cherrypick_generator/lib/module_generator.dart
@@ -11,7 +11,7 @@
 // limitations under the License.
 //

-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:build/build.dart';
 import 'package:source_gen/source_gen.dart';
 import 'package:cherrypick_annotations/cherrypick_annotations.dart' as ann;
@@ -80,11 +80,11 @@ class ModuleGenerator extends GeneratorForAnnotation<ann.module> {
  /// See file-level docs for usage and generated output example.
  @override
  dynamic generateForAnnotatedElement(
-    Element2 element,
+    Element element,
    ConstantReader annotation,
    BuildStep buildStep,
  ) {
-    if (element is! ClassElement2) {
+    if (element is! ClassElement) {
      throw InvalidGenerationSourceError(
        '@module() can only be applied to classes.',
        element: element,
--- a/cherrypick_generator/lib/src/annotation_validator.dart
+++ b/cherrypick_generator/lib/src/annotation_validator.dart
@@ -12,7 +12,6 @@
 //

 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/element2.dart';
 import 'exceptions.dart';
 import 'metadata_utils.dart';

@@ -53,9 +52,9 @@ class AnnotationValidator {
  ///   - Parameter validation for method arguments.
  ///
  /// Throws [AnnotationValidationException] on any violation.
-  static void validateMethodAnnotations(MethodElement2 method) {
+  static void validateMethodAnnotations(MethodElement method) {
    final annotations = _getAnnotationNames(
-      method.firstFragment.metadata2.annotations,
+      method.metadata.annotations,
    );

    _validateMutuallyExclusiveAnnotations(method, annotations);
@@ -71,9 +70,9 @@ class AnnotationValidator {
  ///   - Correct scope naming if present.
  ///
  /// Throws [AnnotationValidationException] if checks fail.
-  static void validateFieldAnnotations(FieldElement2 field) {
+  static void validateFieldAnnotations(FieldElement field) {
    final annotations = _getAnnotationNames(
-      field.firstFragment.metadata2.annotations,
+      field.metadata.annotations,
    );

    _validateInjectFieldAnnotations(field, annotations);
@@ -87,9 +86,9 @@ class AnnotationValidator {
  ///   - Provides helpful context for error/warning reporting.
  ///
  /// Throws [AnnotationValidationException] if checks fail.
-  static void validateClassAnnotations(ClassElement2 classElement) {
+  static void validateClassAnnotations(ClassElement classElement) {
    final annotations = _getAnnotationNames(
-      classElement.firstFragment.metadata2.annotations,
+      classElement.metadata.annotations,
    );

    _validateModuleClassAnnotations(classElement, annotations);
@@ -111,7 +110,7 @@ class AnnotationValidator {
  ///
  /// For example, `@instance` and `@provide` cannot both be present.
  static void _validateMutuallyExclusiveAnnotations(
-    MethodElement2 method,
+    MethodElement method,
    List<String> annotations,
  ) {
    // @instance and @provide are mutually exclusive
@@ -134,7 +133,7 @@ class AnnotationValidator {
  /// - One of `@instance` or `@provide` must be present for a registration method
  /// - Validates singleton usage
  static void _validateAnnotationCombinations(
-    MethodElement2 method,
+    MethodElement method,
    List<String> annotations,
  ) {
    // @params can only be used with @provide
@@ -172,7 +171,7 @@ class AnnotationValidator {

  /// Singleton-specific method annotation checks.
  static void _validateSingletonUsage(
-    MethodElement2 method,
+    MethodElement method,
    List<String> annotations,
  ) {
    // Singleton with params might not make sense in some contexts
@@ -194,10 +193,10 @@ class AnnotationValidator {
  }

  /// Validates extra requirements or syntactic rules for annotation arguments, like @named.
-  static void _validateAnnotationParameters(MethodElement2 method) {
+  static void _validateAnnotationParameters(MethodElement method) {
    // Validate @named annotation parameters
    final namedValue = MetadataUtils.getNamedValue(
-      method.firstFragment.metadata2.annotations,
+      method.metadata.annotations,
    );
    if (namedValue != null) {
      if (namedValue.isEmpty) {
@@ -230,7 +229,7 @@ class AnnotationValidator {
    // Validate method parameters for @params usage
    for (final param in method.formalParameters) {
      final paramAnnotations = _getAnnotationNames(
-        param.firstFragment.metadata2.annotations,
+        param.metadata.annotations,
      );
      if (paramAnnotations.contains('params')) {
        _validateParamsParameter(param, method);
@@ -241,7 +240,7 @@ class AnnotationValidator {
  /// Checks that @params is used with compatible parameter type.
  static void _validateParamsParameter(
    FormalParameterElement param,
-    MethodElement2 method,
+    MethodElement method,
  ) {
    // @params parameter should typically be dynamic or Map<String, dynamic>
    final paramType = param.type.getDisplayString();
@@ -266,7 +265,7 @@ class AnnotationValidator {

  /// Checks field-level annotation for valid injectable fields.
  static void _validateInjectFieldAnnotations(
-    FieldElement2 field,
+    FieldElement field,
    List<String> annotations,
  ) {
    if (!annotations.contains('inject')) {
@@ -285,7 +284,7 @@ class AnnotationValidator {
    }

    // Validate scope annotation if present
-    for (final meta in field.firstFragment.metadata2.annotations) {
+    for (final meta in field.metadata.annotations) {
      final obj = meta.computeConstantValue();
      final type = obj?.type?.getDisplayString();
      if (type == 'scope') {
@@ -297,7 +296,7 @@ class AnnotationValidator {

  /// Checks @module usage: must have at least one DI method, each with DI-annotation.
  static void _validateModuleClassAnnotations(
-    ClassElement2 classElement,
+    ClassElement classElement,
    List<String> annotations,
  ) {
    if (!annotations.contains('module')) {
@@ -305,7 +304,7 @@ class AnnotationValidator {
    }

    // Check if class has public methods
-    final publicMethods = classElement.methods2
+    final publicMethods = classElement.methods
        .where((m) => m.isPublic)
        .toList();
    if (publicMethods.isEmpty) {
@@ -323,7 +322,7 @@ class AnnotationValidator {
    // Validate that public methods have appropriate annotations
    for (final method in publicMethods) {
      final methodAnnotations = _getAnnotationNames(
-        method.firstFragment.metadata2.annotations,
+        method.metadata.annotations,
      );
      if (!methodAnnotations.contains('instance') &&
          !methodAnnotations.contains('provide')) {
@@ -342,7 +341,7 @@ class AnnotationValidator {

  /// Checks @injectable usage on classes and their fields.
  static void _validateInjectableClassAnnotations(
-    ClassElement2 classElement,
+    ClassElement classElement,
    List<String> annotations,
  ) {
    if (!annotations.contains('injectable')) {
@@ -350,9 +349,9 @@ class AnnotationValidator {
    }

    // Check if class has injectable fields
-    final injectFields = classElement.fields2.where((f) {
+    final injectFields = classElement.fields.where((f) {
      final fieldAnnotations = _getAnnotationNames(
-        f.firstFragment.metadata2.annotations,
+        f.metadata.annotations,
      );
      return fieldAnnotations.contains('inject');
    }).toList();
--- a/cherrypick_generator/lib/src/bind_spec.dart
+++ b/cherrypick_generator/lib/src/bind_spec.dart
@@ -11,7 +11,7 @@
 // limitations under the License.
 //

-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';

 import 'bind_parameters_spec.dart';
 import 'metadata_utils.dart';
@@ -251,7 +251,7 @@ class BindSpec {
  /// print(bindSpec.returnType); // e.g., 'Logger'
  /// ```
  /// Throws [AnnotationValidationException] or [CodeGenerationException] if invalid.
-  static BindSpec fromMethod(MethodElement2 method) {
+  static BindSpec fromMethod(MethodElement method) {
    try {
      // Validate method annotations
      AnnotationValidator.validateMethodAnnotations(method);
@@ -259,17 +259,17 @@ class BindSpec {
      // Parse return type using improved type parser
      final parsedReturnType = TypeParser.parseType(method.returnType, method);

-      final methodName = method.firstFragment.name2 ?? '';
+      final methodName = method.name ?? '';

      // Check for @singleton annotation.
      final isSingleton = MetadataUtils.anyMeta(
-        method.firstFragment.metadata2.annotations,
+        method.metadata.annotations,
        'singleton',
      );

      // Get @named value if present.
      final named = MetadataUtils.getNamedValue(
-        method.firstFragment.metadata2.annotations,
+        method.metadata.annotations,
      );

      // Parse each method parameter.
@@ -278,10 +278,10 @@ class BindSpec {
      for (final p in method.formalParameters) {
        final typeStr = p.type.getDisplayString();
        final paramNamed = MetadataUtils.getNamedValue(
-          p.firstFragment.metadata2.annotations,
+          p.metadata.annotations,
        );
        final isParams = MetadataUtils.anyMeta(
-          p.firstFragment.metadata2.annotations,
+          p.metadata.annotations,
          'params',
        );
        if (isParams) hasParams = true;
@@ -290,11 +290,11 @@ class BindSpec {

      // Determine bindingType: @instance or @provide.
      final hasInstance = MetadataUtils.anyMeta(
-        method.firstFragment.metadata2.annotations,
+        method.metadata.annotations,
        'instance',
      );
      final hasProvide = MetadataUtils.anyMeta(
-        method.firstFragment.metadata2.annotations,
+        method.metadata.annotations,
        'provide',
      );

--- a/cherrypick_generator/lib/src/exceptions.dart
+++ b/cherrypick_generator/lib/src/exceptions.dart
@@ -11,7 +11,7 @@
 // limitations under the License.
 //

-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:source_gen/source_gen.dart';

 /// ---------------------------------------------------------------------------
@@ -48,7 +48,7 @@ class CherryPickGeneratorException extends InvalidGenerationSourceError {

  CherryPickGeneratorException(
    String message, {
-    required Element2 element,
+    required Element element,
    required this.category,
    this.suggestion,
    this.context,
@@ -62,7 +62,7 @@ class CherryPickGeneratorException extends InvalidGenerationSourceError {
    String category,
    String? suggestion,
    Map<String, dynamic>? context,
-    Element2 element,
+    Element element,
  ) {
    final buffer = StringBuffer();

--- a/cherrypick_generator/lib/src/generated_class.dart
+++ b/cherrypick_generator/lib/src/generated_class.dart
@@ -12,7 +12,6 @@
 //

 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/element2.dart';
 import 'bind_spec.dart';

 /// ---------------------------------------------------------------------------
@@ -76,11 +75,11 @@ class GeneratedClass {
  /// final gen = GeneratedClass.fromClassElement(classElement);
  /// print(gen.generatedClassName); // e.g. $AppModule
  /// ```
-  static GeneratedClass fromClassElement(ClassElement2 element) {
-    final className = element.firstFragment.name2 ?? '';
+  static GeneratedClass fromClassElement(ClassElement element) {
+    final className = element.name ?? '';
    final generatedClassName = r'$' + className;
    final sourceFile = element.firstFragment.libraryFragment.source.shortName;
-    final binds = element.methods2
+    final binds = element.methods
        .where((m) => !m.isAbstract)
        .map(BindSpec.fromMethod)
        .toList();
--- a/cherrypick_generator/lib/src/metadata_utils.dart
+++ b/cherrypick_generator/lib/src/metadata_utils.dart
@@ -23,10 +23,10 @@ import 'package:analyzer/dart/element/element.dart';
 ///
 /// # Example usage
 /// ```dart
-/// if (MetadataUtils.anyMeta(method.metadata, 'singleton')) {
+/// if (MetadataUtils.anyMeta(method.metadata.annotations, 'singleton')) {
 ///   // The method is annotated with @singleton
 /// }
-/// final name = MetadataUtils.getNamedValue(field.metadata);
+/// final name = MetadataUtils.getNamedValue(field.metadata.annotations);
 /// if (name != null) print('@named value: $name');
 /// ```
 /// ---------------------------------------------------------------------------
@@ -38,7 +38,7 @@ class MetadataUtils {
  ///
  /// Example:
  /// ```dart
-  /// bool isSingleton = MetadataUtils.anyMeta(myMethod.metadata, 'singleton');
+  /// bool isSingleton = MetadataUtils.anyMeta(myMethod.metadata.annotations, 'singleton');
  /// ```
  static bool anyMeta(List<ElementAnnotation> meta, String typeName) {
    return meta.any(
--- a/cherrypick_generator/lib/src/type_parser.dart
+++ b/cherrypick_generator/lib/src/type_parser.dart
@@ -11,7 +11,7 @@
 // limitations under the License.
 //

-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'exceptions.dart';
@@ -45,7 +45,7 @@ class TypeParser {
  /// final parsed = TypeParser.parseType(field.type, field);
  /// if (parsed.isNullable) print('Field is nullable');
  /// ```
-  static ParsedType parseType(DartType dartType, Element2 context) {
+  static ParsedType parseType(DartType dartType, Element context) {
    try {
      return _parseTypeInternal(dartType, context);
    } catch (e) {
@@ -61,7 +61,7 @@ class TypeParser {
    }
  }

-  static ParsedType _parseTypeInternal(DartType dartType, Element2 context) {
+  static ParsedType _parseTypeInternal(DartType dartType, Element context) {
    final displayString = dartType.getDisplayString();
    final isNullable = dartType.nullabilitySuffix == NullabilitySuffix.question;

@@ -88,7 +88,7 @@ class TypeParser {

  static ParsedType _parseFutureType(
    DartType dartType,
-    Element2 context,
+    Element context,
    bool isNullable,
  ) {
    if (dartType is! ParameterizedType || dartType.typeArguments.isEmpty) {
@@ -116,7 +116,7 @@ class TypeParser {

  static ParsedType _parseGenericType(
    ParameterizedType dartType,
-    Element2 context,
+    Element context,
    bool isNullable,
  ) {
    final typeArguments = dartType.typeArguments
@@ -144,7 +144,7 @@ class TypeParser {
  /// final parsed = TypeParser.parseType(field.type, field);
  /// TypeParser.validateInjectableType(parsed, field);
  /// ```
-  static void validateInjectableType(ParsedType parsedType, Element2 context) {
+  static void validateInjectableType(ParsedType parsedType, Element context) {
    // Check for void type
    if (parsedType.coreType == 'void') {
      throw TypeParsingException(
--- a/cherrypick_generator/pubspec.yaml
+++ b/cherrypick_generator/pubspec.yaml
@@ -2,7 +2,7 @@ name: cherrypick_generator
 description: |
  Source code generator for the cherrypick dependency injection system. Processes annotations to generate binding and module code for Dart & Flutter projects.

-version: 3.0.2-dev.0
+version: 4.0.0-dev.0
 homepage: https://cherrypick-di.netlify.app
 documentation: https://cherrypick-di.netlify.app/docs/intro
 repository: https://github.com/pese-git/cherrypick/cherrypick_generator
@@ -15,15 +15,15 @@ topics:
  - inversion-of-control

 environment:
-  sdk: ">=3.8.0 <4.0.0"
+  sdk: ">=3.9.0 <4.0.0"

 # Add regular dependencies here.
 dependencies:
-  cherrypick_annotations: ^3.0.2-dev.0
-  analyzer: ">=7.5.9 <8.0.0"
+  cherrypick_annotations: ^4.0.0-dev.0
+  analyzer: ^9.0.0
  dart_style: ^3.0.0
-  build: ^3.0.0
-  source_gen: ^3.1.0
+  build: ^4.0.4
+  source_gen: ^4.2.0
  collection: ^1.18.0

 dev_dependencies:
--- a/cherrypick_generator/test/type_parser_test.dart
+++ b/cherrypick_generator/test/type_parser_test.dart
@@ -1,4 +1,4 @@
-import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:test/test.dart';

 import 'package:cherrypick_generator/src/type_parser.dart';
@@ -223,20 +223,14 @@ void main() {
 }

 // Mock element for testing
-Element2 _createMockElement() {
+Element _createMockElement() {
  return _MockElement();
 }

-class _MockElement implements Element2 {
+class _MockElement implements Element {
  @override
  String get displayName => 'MockElement';

-  //@override
-  //String get name => 'MockElement';
-  //
-  //@override
-  //Source? get source => null;
-
  @override
  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
--- a/examples/client_app/pubspec.lock
+++ b/examples/client_app/pubspec.lock
@@ -5,18 +5,18 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f
+      sha256: "5b7468c326d2f8a4f630056404ca0d291ade42918f4a3c6233618e724f39da8e"
      url: "https://pub.dev"
    source: hosted
-    version: "85.0.0"
+    version: "92.0.0"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
-      sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d"
+      sha256: "70e4b1ef8003c64793a9e268a551a82869a8a96f39deb73dea28084b0e8bf75e"
      url: "https://pub.dev"
    source: hosted
-    version: "7.7.1"
+    version: "9.0.0"
  args:
    dependency: transitive
    description:
@@ -45,10 +45,10 @@ packages:
    dependency: transitive
    description:
      name: build
-      sha256: ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d
+      sha256: "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.0"
+    version: "4.0.4"
  build_config:
    dependency: transitive
    description:
@@ -61,34 +61,18 @@ packages:
    dependency: transitive
    description:
      name: build_daemon
-      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
+      sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.4"
-  build_resolvers:
-    dependency: transitive
-    description:
-      name: build_resolvers
-      sha256: d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.3"
+    version: "4.1.1"
  build_runner:
    dependency: "direct dev"
    description:
      name: build_runner
-      sha256: b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30
+      sha256: b4d854962a32fd9f8efc0b76f98214790b833af8b2e9b2df6bfc927c0415a072
      url: "https://pub.dev"
    source: hosted
-    version: "2.7.1"
-  build_runner_core:
-    dependency: transitive
-    description:
-      name: build_runner_core
-      sha256: "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.3.1"
+    version: "2.10.5"
  built_collection:
    dependency: transitive
    description:
@@ -101,10 +85,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:
@@ -127,28 +111,28 @@ packages:
      path: "../../cherrypick"
      relative: true
    source: path
-    version: "3.0.0"
+    version: "3.0.2"
  cherrypick_annotations:
    dependency: "direct main"
    description:
      path: "../../cherrypick_annotations"
      relative: true
    source: path
-    version: "3.0.0"
+    version: "4.0.0-dev.0"
  cherrypick_flutter:
    dependency: "direct main"
    description:
      path: "../../cherrypick_flutter"
      relative: true
    source: path
-    version: "3.0.0"
+    version: "3.0.2"
  cherrypick_generator:
    dependency: "direct dev"
    description:
      path: "../../cherrypick_generator"
      relative: true
    source: path
-    version: "3.0.0"
+    version: "4.0.0-dev.0"
  clock:
    dependency: transitive
    description:
@@ -161,10 +145,10 @@ packages:
    dependency: transitive
    description:
      name: code_builder
-      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
+      sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d"
      url: "https://pub.dev"
    source: hosted
-    version: "4.10.1"
+    version: "4.11.1"
  collection:
    dependency: transitive
    description:
@@ -185,10 +169,10 @@ packages:
    dependency: transitive
    description:
      name: crypto
-      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
+      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
  cupertino_icons:
    dependency: "direct main"
    description:
@@ -201,10 +185,10 @@ packages:
    dependency: transitive
    description:
      name: dart_style
-      sha256: "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb"
+      sha256: a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.1"
+    version: "3.1.3"
  fake_async:
    dependency: transitive
    description:
@@ -247,14 +231,6 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
-  frontend_server_client:
-    dependency: transitive
-    description:
-      name: frontend_server_client
-      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
  glob:
    dependency: transitive
    description:
@@ -299,34 +275,34 @@ packages:
    dependency: transitive
    description:
      name: json_annotation
-      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      sha256: "805fa86df56383000f640384b282ce0cb8431f1a7a2396de92fb66186d8c57df"
      url: "https://pub.dev"
    source: hosted
-    version: "4.9.0"
+    version: "4.10.0"
  leak_tracker:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.9"
+    version: "11.0.2"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.9"
+    version: "3.0.10"
  leak_tracker_testing:
    dependency: transitive
    description:
      name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
  lints:
    dependency: transitive
    description:
@@ -363,10 +339,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
      url: "https://pub.dev"
    source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
  mime:
    dependency: transitive
    description:
@@ -395,10 +371,10 @@ packages:
    dependency: transitive
    description:
      name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
      url: "https://pub.dev"
    source: hosted
-    version: "1.5.1"
+    version: "1.5.2"
  pub_semver:
    dependency: transitive
    description:
@@ -440,10 +416,10 @@ packages:
    dependency: transitive
    description:
      name: source_gen
-      sha256: "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3"
+      sha256: "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.0"
+    version: "4.2.0"
  source_span:
    dependency: transitive
    description:
@@ -496,18 +472,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.4"
-  timing:
-    dependency: transitive
-    description:
-      name: timing
-      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
+    version: "0.7.7"
  typed_data:
    dependency: transitive
    description:
@@ -520,26 +488,26 @@ packages:
    dependency: transitive
    description:
      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
  vm_service:
    dependency: transitive
    description:
      name: vm_service
-      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
+      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
      url: "https://pub.dev"
    source: hosted
-    version: "15.0.0"
+    version: "15.0.2"
  watcher:
    dependency: transitive
    description:
      name: watcher
-      sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c"
+      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.3"
+    version: "1.2.1"
  web:
    dependency: transitive
    description:
@@ -573,5 +541,5 @@ packages:
    source: hosted
    version: "3.1.3"
 sdks:
-  dart: ">=3.8.0 <4.0.0"
+  dart: ">=3.9.0 <4.0.0"
  flutter: ">=3.18.0-18.0.pre.54"
--- a/examples/client_app/pubspec.yaml
+++ b/examples/client_app/pubspec.yaml
@@ -5,7 +5,7 @@ publish_to: 'none'
 version: 1.0.0+1

 environment:
-  sdk: ">=3.8.0 <4.0.0"
+  sdk: ">=3.9.0 <4.0.0"


 dependencies:
--- a/examples/postly/pubspec.lock
+++ b/examples/postly/pubspec.lock
@@ -5,18 +5,18 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f
+      sha256: "5b7468c326d2f8a4f630056404ca0d291ade42918f4a3c6233618e724f39da8e"
      url: "https://pub.dev"
    source: hosted
-    version: "85.0.0"
+    version: "92.0.0"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
-      sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d"
+      sha256: "70e4b1ef8003c64793a9e268a551a82869a8a96f39deb73dea28084b0e8bf75e"
      url: "https://pub.dev"
    source: hosted
-    version: "7.7.1"
+    version: "9.0.0"
  ansi_styles:
    dependency: transitive
    description:
@@ -53,26 +53,26 @@ packages:
    dependency: "direct main"
    description:
      name: auto_route
-      sha256: c820e918863a03544aac68eaf61e17c8a6126b663d7cad24a8fd3657a1e6be61
+      sha256: "6d3ccc11b520b6eff0ab5a2c3d1c43c46d1486249cc746c4bb14486d876e8b43"
      url: "https://pub.dev"
    source: hosted
-    version: "10.1.2"
+    version: "10.3.0"
  auto_route_generator:
    dependency: "direct dev"
    description:
      name: auto_route_generator
-      sha256: ed4b65e85b4b2b00b06ef1e44c8623985c52c32d05d72147e3201257aa70a115
+      sha256: a84dcd972e3e38c8925cca2669faa8112a79db9b5d726e0fb8d4ea15ced095fb
      url: "https://pub.dev"
    source: hosted
-    version: "10.2.4"
+    version: "10.3.1"
  bloc:
    dependency: transitive
    description:
      name: bloc
-      sha256: "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189"
+      sha256: a48653a82055a900b88cd35f92429f068c5a8057ae9b136d197b3d56c57efb81
      url: "https://pub.dev"
    source: hosted
-    version: "9.0.0"
+    version: "9.2.0"
  boolean_selector:
    dependency: transitive
    description:
@@ -85,10 +85,10 @@ packages:
    dependency: transitive
    description:
      name: build
-      sha256: ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d
+      sha256: "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.0"
+    version: "4.0.4"
  build_config:
    dependency: transitive
    description:
@@ -101,34 +101,18 @@ packages:
    dependency: transitive
    description:
      name: build_daemon
-      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
+      sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.4"
-  build_resolvers:
-    dependency: transitive
-    description:
-      name: build_resolvers
-      sha256: d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.3"
+    version: "4.1.1"
  build_runner:
    dependency: "direct dev"
    description:
      name: build_runner
-      sha256: b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30
+      sha256: b4d854962a32fd9f8efc0b76f98214790b833af8b2e9b2df6bfc927c0415a072
      url: "https://pub.dev"
    source: hosted
-    version: "2.7.1"
-  build_runner_core:
-    dependency: transitive
-    description:
-      name: build_runner_core
-      sha256: "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "9.3.1"
+    version: "2.10.5"
  built_collection:
    dependency: transitive
    description:
@@ -141,10 +125,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:
@@ -175,29 +159,21 @@ packages:
      path: "../../cherrypick"
      relative: true
    source: path
-    version: "3.0.0"
+    version: "3.0.2"
  cherrypick_annotations:
    dependency: "direct main"
    description:
      path: "../../cherrypick_annotations"
      relative: true
    source: path
-    version: "3.0.0"
+    version: "4.0.0-dev.0"
  cherrypick_generator:
    dependency: "direct dev"
    description:
      path: "../../cherrypick_generator"
      relative: true
    source: path
-    version: "3.0.0"
-  cli_config:
-    dependency: transitive
-    description:
-      name: cli_config
-      sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.0"
+    version: "4.0.0-dev.0"
  cli_launcher:
    dependency: transitive
    description:
@@ -226,10 +202,10 @@ packages:
    dependency: transitive
    description:
      name: code_builder
-      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
+      sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d"
      url: "https://pub.dev"
    source: hosted
-    version: "4.10.1"
+    version: "4.11.1"
  collection:
    dependency: transitive
    description:
@@ -254,30 +230,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.1.2"
-  coverage:
-    dependency: transitive
-    description:
-      name: coverage
-      sha256: "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
  cross_file:
    dependency: transitive
    description:
      name: cross_file
-      sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670"
+      sha256: "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.4+2"
+    version: "0.3.5+1"
  crypto:
    dependency: transitive
    description:
      name: crypto
-      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
+      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
  cupertino_icons:
    dependency: "direct main"
    description:
@@ -290,10 +258,10 @@ packages:
    dependency: transitive
    description:
      name: dart_style
-      sha256: "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb"
+      sha256: a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.1"
+    version: "3.1.3"
  dartz:
    dependency: "direct main"
    description:
@@ -306,10 +274,10 @@ packages:
    dependency: "direct main"
    description:
      name: dio
-      sha256: d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9
+      sha256: b9d46faecab38fc8cc286f80bc4d61a3bb5d4ac49e51ed877b4d6706efe57b25
      url: "https://pub.dev"
    source: hosted
-    version: "5.9.0"
+    version: "5.9.1"
  dio_web_adapter:
    dependency: transitive
    description:
@@ -330,10 +298,10 @@ packages:
    dependency: transitive
    description:
      name: ffi
-      sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
+      sha256: d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
  file:
    dependency: transitive
    description:
@@ -385,10 +353,10 @@ packages:
    dependency: "direct dev"
    description:
      name: freezed
-      sha256: da32f8ba8cfcd4ec71d9decc8cbf28bd2c31b5283d9887eb51eb4a0659d8110c
+      sha256: "03dd9b7423ff0e31b7e01b2204593e5e1ac5ee553b6ea9d8184dff4a26b9fb07"
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.0"
+    version: "3.2.4"
  freezed_annotation:
    dependency: "direct main"
    description:
@@ -441,10 +409,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:
@@ -469,14 +437,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: "direct main"
    description:
@@ -489,42 +449,42 @@ packages:
    dependency: "direct dev"
    description:
      name: json_serializable
-      sha256: "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe"
+      sha256: "5b89c1e32ae3840bb20a1b3434e3a590173ad3cb605896fb0f60487ce2f8104e"
      url: "https://pub.dev"
    source: hosted
-    version: "6.11.1"
+    version: "6.11.4"
  leak_tracker:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.9"
+    version: "11.0.2"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.9"
+    version: "3.0.10"
  leak_tracker_testing:
    dependency: transitive
    description:
      name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
  lean_builder:
    dependency: transitive
    description:
      name: lean_builder
-      sha256: "3d3a04c9dda8ced6b2a48d23aaf98ef5aa32f68f9c62da1b6c6d45bf03aa8164"
+      sha256: "4f3d70c34c52cc5034e8cc6f53d35aa3a32fb373b78fb4c29cf45cd1dcf06942"
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.1"
+    version: "0.1.5"
  lints:
    dependency: transitive
    description:
@@ -569,10 +529,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
      url: "https://pub.dev"
    source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
  mime:
    dependency: transitive
    description:
@@ -585,10 +545,10 @@ packages:
    dependency: transitive
    description:
      name: mustache_template
-      sha256: a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c
+      sha256: "4326d0002ff58c74b9486990ccbdab08157fca3c996fe9e197aff9d61badf307"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.0"
+    version: "2.0.3"
  nested:
    dependency: transitive
    description:
@@ -597,14 +557,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.0"
-  node_preamble:
-    dependency: transitive
-    description:
-      name: node_preamble
-      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
  package_config:
    dependency: transitive
    description:
@@ -633,18 +585,18 @@ packages:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db"
+      sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.18"
+    version: "2.2.22"
  path_provider_foundation:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
+      sha256: "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.2"
+    version: "2.5.1"
  path_provider_linux:
    dependency: transitive
    description:
@@ -689,10 +641,10 @@ packages:
    dependency: transitive
    description:
      name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
      url: "https://pub.dev"
    source: hosted
-    version: "1.5.1"
+    version: "1.5.2"
  process:
    dependency: transitive
    description:
@@ -713,10 +665,10 @@ packages:
    dependency: transitive
    description:
      name: protobuf
-      sha256: de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e
+      sha256: "75ec242d22e950bdcc79ee38dd520ce4ee0bc491d7fadc4ea47694604d22bf06"
      url: "https://pub.dev"
    source: hosted
-    version: "4.2.0"
+    version: "6.0.0"
  provider:
    dependency: transitive
    description:
@@ -753,26 +705,26 @@ packages:
    dependency: "direct main"
    description:
      name: retrofit
-      sha256: "699cf44ec6c7fc7d248740932eca75d334e36bdafe0a8b3e9ff93100591c8a25"
+      sha256: "0f629ed26b2c48c66fe54bd548313c6fdf7955be18bff37e08a46dd3f97f8eaf"
      url: "https://pub.dev"
    source: hosted
-    version: "4.7.2"
+    version: "4.9.2"
  retrofit_generator:
    dependency: "direct dev"
    description:
      name: retrofit_generator
-      sha256: "4a2ac0364eb7d5975f71450dfd553b1591ecffad96438a01ce88494a266bceb4"
+      sha256: fed2c4e4ed6dab084c00d25c739988aa3cec1acd2b168771136188cced8d967d
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.5"
+    version: "10.2.1"
  share_plus:
    dependency: transitive
    description:
      name: share_plus
-      sha256: d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1
+      sha256: "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840"
      url: "https://pub.dev"
    source: hosted
-    version: "11.1.0"
+    version: "12.0.1"
  share_plus_platform_interface:
    dependency: transitive
    description:
@@ -789,22 +741,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.4.2"
-  shelf_packages_handler:
-    dependency: transitive
-    description:
-      name: shelf_packages_handler
-      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.2"
-  shelf_static:
-    dependency: transitive
-    description:
-      name: shelf_static
-      sha256: c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.3"
  shelf_web_socket:
    dependency: transitive
    description:
@@ -822,34 +758,18 @@ packages:
    dependency: transitive
    description:
      name: source_gen
-      sha256: "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3"
+      sha256: "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.0"
+    version: "4.2.0"
  source_helper:
    dependency: transitive
    description:
      name: source_helper
-      sha256: "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723"
+      sha256: "4a85e90b50694e652075cbe4575665539d253e6ec10e46e76b45368ab5e3caae"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.8"
-  source_map_stack_trace:
-    dependency: transitive
-    description:
-      name: source_map_stack_trace
-      sha256: c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  source_maps:
-    dependency: transitive
-    description:
-      name: source_maps
-      sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.10.13"
+    version: "1.3.10"
  source_span:
    dependency: transitive
    description:
@@ -858,14 +778,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.10.1"
-  sprintf:
-    dependency: transitive
-    description:
-      name: sprintf
-      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.0"
  stack_trace:
    dependency: transitive
    description:
@@ -902,49 +814,49 @@ packages:
    dependency: transitive
    description:
      name: talker
-      sha256: "2d742b54e5cda58b7d386cd2d95088c3429ef273b2a0869dec552fe02601367a"
+      sha256: "4160d27f4da6d87f016212bbe6abfb15c8954b72726a0f154d72f77664c48b8c"
      url: "https://pub.dev"
    source: hosted
-    version: "5.0.0"
+    version: "5.1.13"
  talker_bloc_logger:
    dependency: "direct main"
    description:
      name: talker_bloc_logger
-      sha256: "7752ca8a0b2eba487c8c189ca2390ebfcdaa4f7b10eda27587e5067e4427e7cd"
+      sha256: d69cfaf3b7294babc1f2b0e297fb33b885cc859a4ceae5393bd39da9eb93e537
      url: "https://pub.dev"
    source: hosted
-    version: "5.0.0"
+    version: "5.1.13"
  talker_cherrypick_logger:
    dependency: "direct main"
    description:
      path: "../../talker_cherrypick_logger"
      relative: true
    source: path
-    version: "3.0.0"
+    version: "3.0.2"
  talker_dio_logger:
    dependency: "direct main"
    description:
      name: talker_dio_logger
-      sha256: "20cc3bc9820fa73040f23e27d5d86462e590ddf02c43d0a801c56bf5ecc68922"
+      sha256: c5769f4b1ee6fcc1a0670cdfc7f3253016a1090b583aeb70e3ccd73f479970a8
      url: "https://pub.dev"
    source: hosted
-    version: "5.0.0"
+    version: "5.1.13"
  talker_flutter:
    dependency: "direct main"
    description:
      name: talker_flutter
-      sha256: d249fa16936a08fe5c4fb9e2b9b122fdcbaef6be9c4dcf61e448d0b76f3179f1
+      sha256: "6a807972565dc7d5bacfb6a980efa0f766bfdbacac5660adf150aa386c440052"
      url: "https://pub.dev"
    source: hosted
-    version: "5.0.0"
+    version: "5.1.13"
  talker_logger:
    dependency: transitive
    description:
      name: talker_logger
-      sha256: "4f06d46db664c11cf4d629378da661f2c75aee629e3ef898dbc3cf44a0c41cd7"
+      sha256: ed5f8434f17f3988548abc5f617b88e7a5d2d61d7a975e7c12eee75755848aa8
      url: "https://pub.dev"
    source: hosted
-    version: "5.0.0"
+    version: "5.1.13"
  term_glyph:
    dependency: transitive
    description:
@@ -953,38 +865,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.2.2"
-  test:
-    dependency: transitive
-    description:
-      name: test
-      sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.25.15"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.4"
-  test_core:
-    dependency: transitive
-    description:
-      name: test_core
-      sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.8"
-  timing:
-    dependency: transitive
-    description:
-      name: timing
-      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
+    version: "0.7.7"
  typed_data:
    dependency: transitive
    description:
@@ -997,10 +885,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_linux
-      sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935"
+      sha256: d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
  url_launcher_platform_interface:
    dependency: transitive
    description:
@@ -1013,50 +901,50 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_web
-      sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
+      sha256: d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
  url_launcher_windows:
    dependency: transitive
    description:
      name: url_launcher_windows
-      sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77"
+      sha256: "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
  uuid:
    dependency: transitive
    description:
      name: uuid
-      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
+      sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8
      url: "https://pub.dev"
    source: hosted
-    version: "4.5.1"
+    version: "4.5.2"
  vector_math:
    dependency: transitive
    description:
      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
  vm_service:
    dependency: transitive
    description:
      name: vm_service
-      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
+      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
      url: "https://pub.dev"
    source: hosted
-    version: "15.0.0"
+    version: "15.0.2"
  watcher:
    dependency: transitive
    description:
      name: watcher
-      sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c"
+      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.3"
+    version: "1.2.1"
  web:
    dependency: transitive
    description:
@@ -1081,22 +969,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.0.3"
-  webkit_inspection_protocol:
-    dependency: transitive
-    description:
-      name: webkit_inspection_protocol
-      sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
  win32:
    dependency: transitive
    description:
      name: win32
-      sha256: "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03"
+      sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e
      url: "https://pub.dev"
    source: hosted
-    version: "5.14.0"
+    version: "5.15.0"
  xdg_directories:
    dependency: transitive
    description:
@@ -1125,10 +1005,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.8.0 <4.0.0"
-  flutter: ">=3.29.0"
+  dart: ">=3.10.0 <4.0.0"
+  flutter: ">=3.38.0"
--- a/examples/postly/pubspec.yaml
+++ b/examples/postly/pubspec.yaml
@@ -5,7 +5,7 @@ publish_to: 'none'
 version: 1.0.0+1

 environment:
-  sdk: ">=3.8.0 <4.0.0"
+  sdk: ">=3.9.0 <4.0.0"


 dependencies:
@@ -13,7 +13,7 @@ dependencies:
    sdk: flutter

  cherrypick: any
-  cherrypick_annotations: ^3.0.2-dev.0
+  cherrypick_annotations: ^4.0.0-dev.0
  
  dio: ^5.4.0
  retrofit: ^4.0.3
@@ -38,10 +38,10 @@ dev_dependencies:
  flutter_lints: ^6.0.0

  build_runner: ^2.5.0
-  cherrypick_generator: ^3.0.2-dev.0
+  cherrypick_generator: ^4.0.0-dev.0
  
  json_serializable: ^6.9.0
-  retrofit_generator: ^10.0.5
+  retrofit_generator: ^10.2.1
  auto_route_generator: ^10.0.1
  freezed: ^3.0.0
  melos: ^6.3.2
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -37,18 +37,18 @@ packages:
    dependency: transitive
    description:
      name: checked_yaml
-      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
  cli_launcher:
    dependency: transitive
    description:
      name: cli_launcher
-      sha256: "67d89e0a1c07b103d1253f6b953a43d3f502ee36805c8cfc21196282c9ddf177"
+      sha256: "17d2744fb9a254c49ec8eda582536abe714ea0131533e24389843a4256f82eac"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.2"
+    version: "0.3.2+1"
  cli_util:
    dependency: transitive
    description:
@@ -57,14 +57,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.4.2"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
  collection:
    dependency: transitive
    description:
@@ -77,10 +69,10 @@ packages:
    dependency: transitive
    description:
      name: conventional_commit
-      sha256: fad254feb6fb8eace2be18855176b0a4b97e0d50e416ff0fe590d5ba83735d34
+      sha256: c40b1b449ce2a63fa2ce852f35e3890b1e182f5951819934c0e4a66254bc0dc3
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.1"
+    version: "0.6.1+1"
  file:
    dependency: transitive
    description:
@@ -109,10 +101,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_parser:
    dependency: transitive
    description:
@@ -121,14 +113,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "4.1.2"
-  intl:
-    dependency: transitive
-    description:
-      name: intl
-      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.19.0"
  io:
    dependency: transitive
    description:
@@ -141,10 +125,10 @@ packages:
    dependency: transitive
    description:
      name: json_annotation
-      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      sha256: "805fa86df56383000f640384b282ce0cb8431f1a7a2396de92fb66186d8c57df"
      url: "https://pub.dev"
    source: hosted
-    version: "4.9.0"
+    version: "4.10.0"
  lints:
    dependency: "direct dev"
    description:
@@ -157,26 +141,26 @@ packages:
    dependency: "direct dev"
    description:
      name: melos
-      sha256: "3f3ab3f902843d1e5a1b1a4dd39a4aca8ba1056f2d32fd8995210fa2843f646f"
+      sha256: "4280dc46bd5b741887cce1e67e5c1a6aaf3c22310035cf5bd33dceeeda62ed22"
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.2"
+    version: "6.3.3"
  meta:
    dependency: "direct main"
    description:
      name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      sha256: "9f29b9bcc8ee287b1a31e0d01be0eae99a930dbffdaecf04b3f3d82a969f296f"
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.0"
+    version: "1.18.1"
  mustache_template:
    dependency: transitive
    description:
      name: mustache_template
-      sha256: a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c
+      sha256: "4326d0002ff58c74b9486990ccbdab08157fca3c996fe9e197aff9d61badf307"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.0"
+    version: "2.0.3"
  path:
    dependency: transitive
    description:
@@ -197,10 +181,10 @@ packages:
    dependency: transitive
    description:
      name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
      url: "https://pub.dev"
    source: hosted
-    version: "1.5.1"
+    version: "1.5.2"
  process:
    dependency: transitive
    description:
@@ -229,10 +213,10 @@ packages:
    dependency: transitive
    description:
      name: pub_updater
-      sha256: "54e8dc865349059ebe7f163d6acce7c89eb958b8047e6d6e80ce93b13d7c9e60"
+      sha256: "739a0161d73a6974c0675b864fb0cf5147305f7b077b7f03a58fa7a9ab3e7e7d"
      url: "https://pub.dev"
    source: hosted
-    version: "0.4.0"
+    version: "0.5.0"
  pubspec_parse:
    dependency: transitive
    description:
@@ -301,9 +285,9 @@ 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.6.0 <4.0.0"
+  dart: ">=3.9.0 <4.0.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,7 +7,7 @@ repository: https://github.com/pese-git/cherrypick
 issue_tracker: https://github.com/pese-git/cherrypick/issues

 environment:
-  sdk: ">=3.2.0 <4.0.0"
+  sdk: ">=3.8.0 <4.0.0"

 dependencies:
  meta: ^1.3.0
--- a/talker_cherrypick_logger/CHANGELOG.md
+++ b/talker_cherrypick_logger/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.2
+
+ - Update a dependency to the latest release.
+
 ## 3.0.1

 - **DOCS**: add Netlify deployment status badge to README files.
--- a/talker_cherrypick_logger/pubspec.yaml
+++ b/talker_cherrypick_logger/pubspec.yaml
@@ -1,6 +1,6 @@
 name: talker_cherrypick_logger
 description: A Talker logger integration for CherryPick DI to observe and log DI events and errors.
-version: 3.0.1
+version: 3.0.2
 homepage: https://cherrypick-di.netlify.app
 documentation: https://cherrypick-di.netlify.app/docs/intro
 repository: https://github.com/pese-git/cherrypick
@@ -18,7 +18,7 @@ environment:
 # Add regular dependencies here.
 dependencies:
  talker: ^5.0.0
-  cherrypick: ^3.0.1
+  cherrypick: ^3.0.2


 dev_dependencies:
Author	SHA1	Message	Date
Sergey Penkovsky	0e555a6849	feat: migrate to analyzer 9.0.0 API - Replace Element2 API with Element API - Update imports from element2.dart to element.dart - Replace .firstFragment.name2 with .name - Replace .firstFragment.metadata2.annotations with .metadata.annotations - Replace .fields2 with .fields - Replace .methods2 with .methods - Remove duplicate imports in annotation_validator.dart and generated_class.dart - Update test mocks to use Element instead of Element2 All generators now work correctly with analyzer 9.0.0: - melos analyze: SUCCESS (0 issues) - melos codegen: SUCCESS (13 outputs generated) - melos bootstrap: SUCCESS (8 packages)	2026-01-30 10:48:48 +03:00
Sergey Penkovsky	e6b3017384	chore(release): publish packages - cherrypick_annotations@4.0.0-dev.0 - cherrypick_generator@4.0.0-dev.0	2026-01-29 23:18:12 +03:00
Sergey Penkovsky	3b2df58e9a	feat!: update Dart SDK minimum versions BREAKING CHANGE: Minimum Dart SDK version updated - cherrypick_annotations: 3.8.0 -> 3.9.0 - cherrypick_generator: requires Dart 3.9.0+ This change may require users to update their Dart SDK.	2026-01-29 23:17:58 +03:00
Sergey Penkovsky	f9100eb9ba	style: remove unnecessary 'this.' qualifiers in binding.dart - Remove unnecessary 'this.' qualifiers from deprecated methods - Fix linter warnings (unnecessary_this)	2026-01-29 23:04:22 +03:00
Sergey Penkovsky	94b3ba284a	chore: update Flutter to 3.38.1 and bump Dart SDK versions - Update Flutter version from 3.32.0 to 3.38.1 in .fvmrc - Bump Dart SDK minimum version in pubspec.yaml files: - Root: 3.2.0 -> 3.8.0 - cherrypick_annotations: 3.8.0 -> 3.9.0 - cherrypick/example: 2.12.0 -> 3.2.0 - examples/postly: 3.8.0 -> 3.9.0 - Apply code formatting fixes in cherrypick_generator - Update dependencies in pubspec.lock files	2026-01-29 23:02:37 +03:00
Sergey Penkovsky	0651f74472	chore(release): publish packages - cherrypick_annotations@3.0.2 - cherrypick_generator@3.0.2	2026-01-29 16:58:46 +03:00
Sergey Penkovsky	776f29945a	chore: format code and update deps	2026-01-29 16:57:28 +03:00
Sergey Penkovsky	49361f2f9e	Merge pull request #27 from pese-git/develop Develop	2026-01-29 16:41:03 +03:00
Sergey Penkovsky	4953e917c9	Merge branch 'master' into develop	2026-01-15 09:00:10 +03:00
Sergey Penkovsky	1997110d92	chore(release): publish packages - cherrypick@3.0.2 - cherrypick_flutter@3.0.2 - talker_cherrypick_logger@3.0.2	2025-10-20 17:31:40 +03:00
Sergey Penkovsky	0e600ca3a2	Merge pull request #25 from pese-git/issues/24 Issues/24	2025-10-20 17:28:01 +03:00
Sergey Penkovsky	25ae208ea1	fix(test): fix warning	2025-10-20 16:20:20 +03:00
Sergey Penkovsky	685c0ae49c	fix(scope): properly clear binding and module references on dispose Add memory leak/finalizer test to ensure no strong references remain after closing and disposing a scope.	2025-10-13 17:32:10 +03:00
Sergey Penkovsky	98d81b13a8	freeze deps	2025-10-13 17:26:39 +03:00