diff --git a/lib/src/generators/router/generator/router_generator.dart b/lib/src/generators/router/generator/router_generator.dart index 6fccc29..384bd83 100644 --- a/lib/src/generators/router/generator/router_generator.dart +++ b/lib/src/generators/router/generator/router_generator.dart @@ -62,7 +62,8 @@ class RouterGenerator implements BaseGenerator { ..body.addAll([...parsedClasses, navigationExtensionClassBuilder]), ); - return DartFormatter().format('${library.accept(emitter)}'); + return DartFormatter(languageVersion: DartFormatter.latestLanguageVersion) + .format('${library.accept(emitter)}'); } /// The classes are: diff --git a/lib/src/generators/router_2/code_builder/library_builder.dart b/lib/src/generators/router_2/code_builder/library_builder.dart index 4bd2dd2..c5acf21 100644 --- a/lib/src/generators/router_2/code_builder/library_builder.dart +++ b/lib/src/generators/router_2/code_builder/library_builder.dart @@ -115,5 +115,6 @@ String generateLibrary( ]), ); - return DartFormatter().format(library.accept(emitter).toString()); + return DartFormatter(languageVersion: DartFormatter.latestLanguageVersion) + .format(library.accept(emitter).toString()); } diff --git a/pubspec.yaml b/pubspec.yaml index 9793d57..dc35788 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,10 +16,10 @@ dependencies: stacked_shared: ^1.3.0 # Removing this will cause issues when publish the package analyzer: ^6.3.0 - dart_style: ^2.3.4 + dart_style: ^3.0.1 code_builder: ^4.3.0 collection: ^1.16.0 - freezed_annotation: ^2.2.0 + freezed_annotation: ^3.0.0 json_annotation: ^4.8.0 xdg_directories: ^1.0.4 @@ -28,6 +28,6 @@ dev_dependencies: test: ^1.20.1 build_test: ^2.1.5 flutter_lints: ^3.0.1 - freezed: ^2.3.2 + freezed: ^3.0.6 json_serializable: ^6.6.1 mockito: ^5.4.4 diff --git a/test/helpers/class_extension.dart b/test/helpers/class_extension.dart index d3f04ad..b7c6bfe 100644 --- a/test/helpers/class_extension.dart +++ b/test/helpers/class_extension.dart @@ -6,7 +6,9 @@ extension SpecExtension on Spec { final library = Library((b) => b..body.add(this)); final emitter = DartEmitter.scoped(); - final result = DartFormatter().format('${library.accept(emitter)}'); + final result = + DartFormatter(languageVersion: DartFormatter.latestLanguageVersion) + .format('${library.accept(emitter)}'); //print(result); return result; } @@ -17,7 +19,9 @@ extension SpecsExtension on Iterable { final library = Library((b) => b..body.addAll(this)); final emitter = DartEmitter.scoped(); - final result = DartFormatter().format('${library.accept(emitter)}'); + final result = + DartFormatter(languageVersion: DartFormatter.latestLanguageVersion) + .format('${library.accept(emitter)}'); return result; } @@ -28,7 +32,9 @@ extension ListExpressionExtension on Iterable { final library = Library((b) => b..body.addAll(this)); final emitter = DartEmitter.scoped(); - final result = DartFormatter().format('${library.accept(emitter)}'); + final result = + DartFormatter(languageVersion: DartFormatter.latestLanguageVersion) + .format('${library.accept(emitter)}'); return result; }