From 63e84c4c526a2aa85be0946833fb649e1eac216d Mon Sep 17 00:00:00 2001 From: saentari Date: Tue, 29 Apr 2025 14:42:00 +0200 Subject: [PATCH 1/3] Updated freezed, freezed_annotation, and source_gen packages --- pubspec.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 8b86e02..b1089ff 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: build: ^2.2.1 path: ^1.8.0 recase: ^4.0.0 - source_gen: ^1.2.7 + source_gen: ^2.0.0 meta: ^1.10.0 logger: ^1.1.0 stacked_shared: ^1.3.0 @@ -19,7 +19,7 @@ dependencies: dart_style: ^2.3.4 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 From a7dd557efc73b76bc3c693d0f4fe687436d8c320 Mon Sep 17 00:00:00 2001 From: saentari Date: Tue, 29 Apr 2025 14:48:37 +0200 Subject: [PATCH 2/3] Updated dart_style package --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index b1089ff..dc35788 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ 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: ^3.0.0 From 722b04dded29789d08e45f0ff42a52a0c63059ce Mon Sep 17 00:00:00 2001 From: saentari Date: Tue, 29 Apr 2025 14:54:28 +0200 Subject: [PATCH 3/3] Added required param for DartFormatter() --- .../router/generator/router_generator.dart | 3 ++- .../router_2/code_builder/library_builder.dart | 3 ++- test/helpers/class_extension.dart | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) 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/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; }