Resolve conflicts

Author: LukasMirbt

packages/go_router_builder/CHANGELOG.md

@@ -1,7 +1,15 @@
-## 3.1.0
+## 3.2.0
 
 - Adds support for `TypedRelativeGoRoute`.
+
+## 3.1.0
+
 - Restricts `build` to versions less than 2.5.0.
+- Updates dependencies to use the latest `analyzer`, `build`, and `source_gen`.
+- Updates dev dependencies to use the latest `build_test`.
+- Migrates to the `element2` API.
+- Improves test code formatting consistency.
+- Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
 
 ## 3.0.1
 

packages/go_router_builder/README.md

@@ -8,12 +8,12 @@ To use `go_router_builder`, you need to have the following dependencies in
 ```yaml
 dependencies:
   # ...along with your other dependencies
-  go_router: ^9.0.3
+  go_router: ^16.1.1
 
 dev_dependencies:
   # ...along with your other dev-dependencies
-  build_runner: ^2.0.0
-  go_router_builder: ^2.3.0
+  build_runner: ^2.6.0
+  go_router_builder: ^3.2.0
 ```
 
 ### Source code

packages/go_router_builder/lib/go_router_builder.dart

@@ -21,7 +21,5 @@ import 'src/go_router_generator.dart';
 /// `go_router`.
 ///
 /// Not meant to be invoked by hand-authored code.
-Builder goRouterBuilder(BuilderOptions options) => SharedPartBuilder(
-      const <Generator>[GoRouterGenerator()],
-      'go_router',
-    );
+Builder goRouterBuilder(BuilderOptions options) =>
+    SharedPartBuilder(const <Generator>[GoRouterGenerator()], 'go_router');

packages/go_router_builder/lib/src/go_router_generator.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:build/build.dart';
 import 'package:source_gen/source_gen.dart';
@@ -28,9 +28,10 @@ class GoRouterGenerator extends Generator {
   const GoRouterGenerator();
 
   TypeChecker get _typeChecker => TypeChecker.any(
-        _annotations.keys.map((String annotation) =>
-            TypeChecker.fromUrl('$_routeDataUrl#$annotation')),
-      );
+    _annotations.keys.map(
+      (String annotation) => TypeChecker.fromUrl('$_routeDataUrl#$annotation'),
+    ),
+  );
 
   @override
   FutureOr<String> generate(LibraryReader library, BuildStep buildStep) async {
@@ -62,48 +63,53 @@ ${getters.map((String e) => "$e,").join('\n')}
     Set<String> values,
     Set<String> getters,
   ) {
-    for (final AnnotatedElement annotatedElement
-        in library.annotatedWith(_typeChecker)) {
+    for (final AnnotatedElement annotatedElement in library.annotatedWith(
+      _typeChecker,
+    )) {
       final InfoIterable generatedValue = _generateForAnnotatedElement(
         annotatedElement.element,
         annotatedElement.annotation,
       );
       getters.add(generatedValue.routeGetterName);
-      for (final String value in generatedValue) {
-        assert(value.length == value.trim().length);
-        values.add(value);
-      }
+      values.addAll(generatedValue.members);
     }
   }
 
   InfoIterable _generateForAnnotatedElement(
-    Element element,
+    Element2 element,
     ConstantReader annotation,
   ) {
-    final String typedAnnotation =
-        withoutNullability(annotation.objectValue.type!.getDisplayString());
-    final String type =
-        typedAnnotation.substring(0, typedAnnotation.indexOf('<'));
+    final String typedAnnotation = withoutNullability(
+      annotation.objectValue.type!.getDisplayString(),
+    );
+    final String type = typedAnnotation.substring(
+      0,
+      typedAnnotation.indexOf('<'),
+    );
     final String routeData = _annotations[type]!;
-    if (element is! ClassElement) {
+    if (element is! ClassElement2) {
       throw InvalidGenerationSourceError(
         'The @$type annotation can only be applied to classes.',
         element: element,
       );
     }
 
-    final TypeChecker dataChecker =
-        TypeChecker.fromUrl('$_routeDataUrl#$routeData');
-    if (!element.allSupertypes
-        .any((InterfaceType element) => dataChecker.isExactlyType(element))) {
+    final TypeChecker dataChecker = TypeChecker.fromUrl(
+      '$_routeDataUrl#$routeData',
+    );
+    if (!element.allSupertypes.any(
+      (InterfaceType element) => dataChecker.isExactlyType(element),
+    )) {
       throw InvalidGenerationSourceError(
         'The @$type annotation can only be applied to classes that '
         'extend or implement `$routeData`.',
         element: element,
       );
     }
 
-    return RouteBaseConfig.fromAnnotation(annotation, element)
-        .generateMembers();
+    return RouteBaseConfig.fromAnnotation(
+      annotation,
+      element,
+    ).generateMembers();
   }
 }

packages/go_router_builder/lib/src/path_utils.dart

@@ -15,9 +15,9 @@ final RegExp _parameterRegExp = RegExp(r':(\w+)(\((?:\\.|[^\\()])+\))?');
 /// final pathParameters = pathParametersFromPattern(pattern); // {'id', 'bookId'}
 /// ```
 Set<String> pathParametersFromPattern(String pattern) => <String>{
-      for (final RegExpMatch match in _parameterRegExp.allMatches(pattern))
-        match[1]!,
-    };
+  for (final RegExpMatch match in _parameterRegExp.allMatches(pattern))
+    match[1]!,
+};
 
 /// Reconstructs the full path from a [pattern] and path parameters.
 ///