fix: fixes after rebase

Author: O-Hannonen

example/lib/complex_sealed_class_examples.g.dart

@@ -2,9 +2,6 @@
 
 - Add `JsonSerializable.unionRename`
 - Add `JsonSerializable.unionDiscriminator`
-
-## 4.9.1-wip
-
 - Require Dart 3.8
 
 ## 4.9.0

example/lib/sealed_class_example.g.dart

@@ -1,12 +1,10 @@
-## 6.10.0
+## 6.11.0-wip
 
 - Add support for deserializing union json to sealed class
 - Add support for serializing sealed class to union json
 
-## 6.9.6-wip
+## 6.10.0
 
-- Required `analyzer: ^7.4.0`.
-- Switch to analyzer element2 model and `build: ^3.0.0-dev`.
 - Move `package:collection` to a dev dependency.
 - Use new `null-aware element` feature in generated code.
 - Require Dart 3.8

json_annotation/CHANGELOG.md

@@ -4,7 +4,6 @@
 
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:build/build.dart';
-import 'package:collection/collection.dart';
 import 'package:source_gen/source_gen.dart';
 
 import '../type_helper.dart';
@@ -56,7 +55,7 @@ class GeneratorHelper extends HelperCore with EncodeHelper, DecodeHelper {
       ),
     );
 
-    if (sealedSupersAndConfigs.firstWhereOrNull((e) => e.config == null)
+    if (sealedSupersAndConfigs.where((e) => e.config == null).firstOrNull
         case final notAnnotated? when sealedSupersAndConfigs.isNotEmpty) {
       throw InvalidGenerationSourceError(
         'The class `${element.displayName}` is annotated '
@@ -82,9 +81,11 @@ class GeneratorHelper extends HelperCore with EncodeHelper, DecodeHelper {
       );
     }
 
-    if (sealedSupersAndConfigs.firstWhereOrNull(
-          (e) => e.config?.unionDiscriminator == config.unionDiscriminator,
-        )
+    if (sealedSupersAndConfigs
+            .where(
+              (e) => e.config?.unionDiscriminator == config.unionDiscriminator,
+            )
+            .firstOrNull
         case final conflictingSuper? when element.isSealed) {
       throw InvalidGenerationSource(
         'The classes `${conflictingSuper.classElement.displayName}` and '
@@ -97,9 +98,9 @@ class GeneratorHelper extends HelperCore with EncodeHelper, DecodeHelper {
       );
     }
 
-    if (sealedSupersAndConfigs.firstWhereOrNull(
-          (e) => e.config?.createToJson != config.createToJson,
-        )
+    if (sealedSupersAndConfigs
+            .where((e) => e.config?.createToJson != config.createToJson)
+            .firstOrNull
         case final diffSuper?) {
       throw InvalidGenerationSourceError(
         'The class `${diffSuper.classElement.displayName}` is sealed but its '
@@ -192,9 +193,9 @@ class GeneratorHelper extends HelperCore with EncodeHelper, DecodeHelper {
       ..fold(<String>{}, (Set<String> set, fe) {
         final jsonKey = nameAccess(fe);
 
-        if (sealedSupersAndConfigs.firstWhereOrNull(
-              (e) => e.config?.unionDiscriminator == jsonKey,
-            )
+        if (sealedSupersAndConfigs
+                .where((e) => e.config?.unionDiscriminator == jsonKey)
+                .firstOrNull
             case final conflict?) {
           throw InvalidGenerationSourceError(
             'The JSON key `$jsonKey` is conflicting with the discriminator '

json_serializable/CHANGELOG.md

@@ -1,5 +1,5 @@
 name: json_serializable
-version: 6.10.0
+version: 6.11.0-wip
 description: >-
   Automatically generate code for converting to and from JSON by annotating
   Dart classes.
@@ -15,11 +15,11 @@ topics:
 resolution: workspace
 
 dependencies:
-  analyzer: ^7.4.0
+  analyzer: '>=7.4.0 <8.0.0'
   async: ^2.10.0
   build: ^3.0.0
   build_config: ^1.1.0
-  dart_style: '>=2.3.7 <4.0.0'
+  dart_style: '>=3.1.0 <4.0.0'
 
   # Use a tight version constraint to ensure that a constraint on
   # `json_annotation` properly constrains all features it provides.