From aba562344d298b8971406cc380a1747216ba44ea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 19:46:04 +0000 Subject: [PATCH 1/3] upgrade: update dependency dart_style to v3 --- packages/core/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml index 64fa4b85c..e10dbc0f3 100644 --- a/packages/core/pubspec.yaml +++ b/packages/core/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: json_annotation: ^4.4.0 glob: ^2.0.0 - dart_style: ^2.2.4 + dart_style: ^3.0.0 archive: ^3.4.0 args: ^2.0.0 pub_semver: ^2.0.0 From bdc8ef4c6feeb41011a70c57d1228420a241af01 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Sun, 15 Dec 2024 10:14:10 +0800 Subject: [PATCH 2/3] Update pubspec.yaml --- packages/core/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml index e10dbc0f3..81af5bb6d 100644 --- a/packages/core/pubspec.yaml +++ b/packages/core/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: json_annotation: ^4.4.0 glob: ^2.0.0 - dart_style: ^3.0.0 + dart_style: '>=2.2.4 <4.0.0' archive: ^3.4.0 args: ^2.0.0 pub_semver: ^2.0.0 From e42d40ab4878ce9297dd333f23fb1d224f6b1efb Mon Sep 17 00:00:00 2001 From: Alex Li Date: Sun, 15 Dec 2024 12:10:21 +0800 Subject: [PATCH 3/3] Specify language version --- packages/core/lib/flutter_generator.dart | 6 +++++- packages/core/test/assets_gen_test.dart | 5 ++++- packages/core/test/colors_gen_test.dart | 10 ++++++++-- packages/core/test/fonts_gen_test.dart | 5 ++++- packages/core/test/gen_test_helper.dart | 3 +++ 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/packages/core/lib/flutter_generator.dart b/packages/core/lib/flutter_generator.dart index d306e3333..2fb0326ad 100644 --- a/packages/core/lib/flutter_generator.dart +++ b/packages/core/lib/flutter_generator.dart @@ -31,7 +31,11 @@ class FlutterGenerator { final flutterGen = config.pubspec.flutterGen; final output = config.pubspec.flutterGen.output; final lineLength = config.pubspec.flutterGen.lineLength; - final formatter = DartFormatter(pageWidth: lineLength, lineEnding: '\n'); + final formatter = DartFormatter( + languageVersion: DartFormatter.latestLanguageVersion, + pageWidth: lineLength, + lineEnding: '\n', + ); void defaultWriter(String contents, String path) { final file = File(path); diff --git a/packages/core/test/assets_gen_test.dart b/packages/core/test/assets_gen_test.dart index 79e795fc6..781b8ab66 100644 --- a/packages/core/test/assets_gen_test.dart +++ b/packages/core/test/assets_gen_test.dart @@ -59,7 +59,10 @@ void main() { final pubspec = File('test_resources/pubspec_assets_no_list.yaml'); final config = loadPubspecConfig(pubspec); final formatter = DartFormatter( - pageWidth: config.pubspec.flutterGen.lineLength, lineEnding: '\n'); + languageVersion: DartFormatter.latestLanguageVersion, + pageWidth: config.pubspec.flutterGen.lineLength, + lineEnding: '\n', + ); expect(() { return generateAssets( diff --git a/packages/core/test/colors_gen_test.dart b/packages/core/test/colors_gen_test.dart index 9828c9f0f..95fca2d5c 100644 --- a/packages/core/test/colors_gen_test.dart +++ b/packages/core/test/colors_gen_test.dart @@ -23,7 +23,10 @@ void main() { final pubspec = File('test_resources/pubspec_colors_no_inputs.yaml'); final config = loadPubspecConfig(pubspec); final formatter = DartFormatter( - pageWidth: config.pubspec.flutterGen.lineLength, lineEnding: '\n'); + languageVersion: DartFormatter.latestLanguageVersion, + pageWidth: config.pubspec.flutterGen.lineLength, + lineEnding: '\n', + ); expect(() { return generateColors( @@ -35,7 +38,10 @@ void main() { final pubspec = File('test_resources/pubspec_colors_no_inputs_list.yaml'); final config = loadPubspecConfig(pubspec); final formatter = DartFormatter( - pageWidth: config.pubspec.flutterGen.lineLength, lineEnding: '\n'); + languageVersion: DartFormatter.latestLanguageVersion, + pageWidth: config.pubspec.flutterGen.lineLength, + lineEnding: '\n', + ); expect(() { return generateColors( diff --git a/packages/core/test/fonts_gen_test.dart b/packages/core/test/fonts_gen_test.dart index 64f1e5ccc..90c7f85de 100644 --- a/packages/core/test/fonts_gen_test.dart +++ b/packages/core/test/fonts_gen_test.dart @@ -23,7 +23,10 @@ void main() { File('test_resources/pubspec_fonts_no_family.yaml'), ); final formatter = DartFormatter( - pageWidth: config.pubspec.flutterGen.lineLength, lineEnding: '\n'); + languageVersion: DartFormatter.latestLanguageVersion, + pageWidth: config.pubspec.flutterGen.lineLength, + lineEnding: '\n', + ); expect(() { return generateFonts(FontsGenConfig.fromConfig(config), formatter); diff --git a/packages/core/test/gen_test_helper.dart b/packages/core/test/gen_test_helper.dart index 917dd3547..c0927dbe7 100644 --- a/packages/core/test/gen_test_helper.dart +++ b/packages/core/test/gen_test_helper.dart @@ -30,6 +30,7 @@ Future> runAssetsGen( final config = loadPubspecConfig(pubspecFile, buildFile: buildFile); final formatter = DartFormatter( + languageVersion: DartFormatter.latestLanguageVersion, pageWidth: config.pubspec.flutterGen.lineLength, lineEnding: '\n', ); @@ -73,6 +74,7 @@ Future> runColorsGen( final pubspecFile = File(pubspec); final config = loadPubspecConfig(pubspecFile); final formatter = DartFormatter( + languageVersion: DartFormatter.latestLanguageVersion, pageWidth: config.pubspec.flutterGen.lineLength, lineEnding: '\n', ); @@ -116,6 +118,7 @@ Future> runFontsGen( final pubspecFile = File(pubspec); final config = loadPubspecConfig(pubspecFile); final formatter = DartFormatter( + languageVersion: DartFormatter.latestLanguageVersion, pageWidth: config.pubspec.flutterGen.lineLength, lineEnding: '\n', );