🔥 Removes Flare integration

.github/workflows/build.yml

@@ -35,29 +35,22 @@ jobs:
         if: startsWith(matrix.os, 'windows')
         run: echo "%LOCALAPPDATA%\Pub\Cache\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-      - name: Get dependencies for macos and ubuntu
-        if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
+      - name: Get dependencies
         run: |
           dart pub global activate melos
           melos bootstrap
 
-      - name: Get dependencies for Windows
-        if: startsWith(matrix.os, 'windows')
-        run: |
-          dart pub global activate melos
-          # FIXME: CI randomly fail
-          melos exec -c 1 -- flutter pub get
-          melos bootstrap
+      - name: Run tests for Dart packages
+        if: startsWith(matrix.os, 'ubuntu')
+        run: melos test:dart --no-select
 
-      - name: Run tests for our dart project.
+      - name: Run tests for Flutter packages
         if: startsWith(matrix.os, 'ubuntu')
-        run: |
-          melos test
+        run: melos test:flutter --no-select
 
       - name: Run coverage
         if: startsWith(matrix.os, 'ubuntu')
-        run: |
-          melos coverage
+        run: melos coverage
 
       - uses: codecov/codecov-action@v5
         with:

README.md

@@ -148,7 +148,6 @@ flutter_gen:
   # Optional
   integrations:
     flutter_svg: true
-    flare_flutter: true
     rive: true
     lottie: true
 
@@ -398,11 +397,9 @@ Widget build(BuildContext context) {
 | Packages                                                | File extension | Setting               | Usage                                     |
 |---------------------------------------------------------|----------------|-----------------------|-------------------------------------------|
 | [flutter_svg](https://pub.dev/packages/flutter_svg)     | .svg           | `flutter_svg: true`   | Assets.images.icons.paint.**svg()**       |
-| [flare_flutter](https://pub.dev/packages/flare_flutter) | .flr           | `flare_flutter: true` | Assets.flare.penguin.**flare()**          |
-| [rive](https://pub.dev/packages/rive)                   | .flr           | `rive: true`          | Assets.rive.vehicles.**rive()**           |
+| [rive](https://pub.dev/packages/rive)                   | .riv           | `rive: true`          | Assets.rive.vehicles.**rive()**           |
 | [lottie](https://pub.dev/packages/lottie)               | .json, .zip    | `lottie: true`        | Assets.lottie.hamburgerArrow.**lottie()** |
 
-
 In other cases, the asset is generated as String class.
 
 ```dart

analysis_options.yaml

@@ -7,6 +7,7 @@ analyzer:
     - '**.g.dart'
     - 'test_resources/**'
   errors:
+    deprecated_member_use_from_same_package: ignore
     unnecessary_import: error
     unawaited_futures: error
 

examples/example/lib/gen/assets.gen.dart

@@ -7,8 +7,6 @@
 // ignore_for_file: type=lint
 // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use
 
-import 'package:flare_flutter/flare_actor.dart' as _flare_actor;
-import 'package:flare_flutter/flare_controller.dart' as _flare_controller;
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_svg/flutter_svg.dart' as _svg;
@@ -20,10 +18,10 @@ class $AssetsFlareGen {
   const $AssetsFlareGen();
 
   /// File path: assets/flare/Penguin.flr
-  FlareGenImage get penguin => const FlareGenImage('assets/flare/Penguin.flr');
+  String get penguin => 'assets/flare/Penguin.flr';
 
   /// List of all assets
-  List<FlareGenImage> get values => [penguin];
+  List<String> get values => [penguin];
 }
 
 class $AssetsImagesGen {
@@ -386,53 +384,6 @@ class SvgGenImage {
   String get keyName => _assetName;
 }
 
-class FlareGenImage {
-  const FlareGenImage(
-    this._assetName, {
-    this.flavors = const {},
-  });
-
-  final String _assetName;
-  final Set<String> flavors;
-
-  _flare_actor.FlareActor flare({
-    String? boundsNode,
-    String? animation,
-    BoxFit fit = BoxFit.contain,
-    Alignment alignment = Alignment.center,
-    bool isPaused = false,
-    bool snapToEnd = false,
-    _flare_controller.FlareController? controller,
-    _flare_actor.FlareCompletedCallback? callback,
-    Color? color,
-    bool shouldClip = true,
-    bool sizeFromArtboard = false,
-    String? artboard,
-    bool antialias = true,
-  }) {
-    return _flare_actor.FlareActor(
-      _assetName,
-      boundsNode: boundsNode,
-      animation: animation,
-      fit: fit,
-      alignment: alignment,
-      isPaused: isPaused,
-      snapToEnd: snapToEnd,
-      controller: controller,
-      callback: callback,
-      color: color,
-      shouldClip: shouldClip,
-      sizeFromArtboard: sizeFromArtboard,
-      artboard: artboard,
-      antialias: antialias,
-    );
-  }
-
-  String get path => _assetName;
-
-  String get keyName => _assetName;
-}
-
 class RiveGenImage {
   const RiveGenImage(
     this._assetName, {

examples/example/lib/main.dart

@@ -31,14 +31,6 @@ void main() async {
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
               // Auto generated image from FlutterGen.
-              SizedBox(
-                width: 200,
-                height: 200,
-                child: MyAssets.flare.penguin.flare(
-                  animation: 'walk',
-                  fit: BoxFit.contain,
-                ),
-              ),
               SizedBox(
                 width: 200,
                 height: 200,
@@ -105,13 +97,6 @@ void main() async {
                   fit: BoxFit.contain,
                 ),
               ),
-              SizedBox(
-                width: 200,
-                height: 200,
-                child: ResAssets.images.favorite.flare(
-                  shouldClip: false,
-                ),
-              ),
               SizedBox(
                 width: 200,
                 height: 200,

examples/example/pubspec.yaml

@@ -11,7 +11,6 @@ dependencies:
     sdk: flutter
 
   flutter_svg: ^2.0.0
-  flare_flutter: ^3.0.0
   rive: ^0.11.0
   lottie: ^2.0.0
 
@@ -31,7 +30,6 @@ flutter_gen:
 
   integrations:
     flutter_svg: true
-    flare_flutter: true
     rive: true
     lottie: true
 

examples/example_resources/lib/gen/assets.gen.dart

@@ -7,8 +7,6 @@
 // ignore_for_file: type=lint
 // ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use
 
-import 'package:flare_flutter/flare_actor.dart' as _flare_actor;
-import 'package:flare_flutter/flare_controller.dart' as _flare_controller;
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_svg/flutter_svg.dart' as _svg;
@@ -23,8 +21,7 @@ class $AssetsImagesGen {
   SvgGenImage get dart => const SvgGenImage('assets/images/dart.svg');
 
   /// File path: assets/images/favorite.flr
-  FlareGenImage get favorite =>
-      const FlareGenImage('assets/images/favorite.flr');
+  String get favorite => 'assets/images/favorite.flr';
 
   /// File path: assets/images/flutter3.jpg
   AssetGenImage get flutter3 =>
@@ -227,55 +224,6 @@ class SvgGenImage {
   String get keyName => 'packages/example_resources/$_assetName';
 }
 
-class FlareGenImage {
-  const FlareGenImage(
-    this._assetName, {
-    this.flavors = const {},
-  });
-
-  final String _assetName;
-  final Set<String> flavors;
-
-  static const String package = 'example_resources';
-
-  _flare_actor.FlareActor flare({
-    String? boundsNode,
-    String? animation,
-    BoxFit fit = BoxFit.contain,
-    Alignment alignment = Alignment.center,
-    bool isPaused = false,
-    bool snapToEnd = false,
-    _flare_controller.FlareController? controller,
-    _flare_actor.FlareCompletedCallback? callback,
-    Color? color,
-    bool shouldClip = true,
-    bool sizeFromArtboard = false,
-    String? artboard,
-    bool antialias = true,
-  }) {
-    return _flare_actor.FlareActor(
-      'packages/example_resources/$_assetName',
-      boundsNode: boundsNode,
-      animation: animation,
-      fit: fit,
-      alignment: alignment,
-      isPaused: isPaused,
-      snapToEnd: snapToEnd,
-      controller: controller,
-      callback: callback,
-      color: color,
-      shouldClip: shouldClip,
-      sizeFromArtboard: sizeFromArtboard,
-      artboard: artboard,
-      antialias: antialias,
-    );
-  }
-
-  String get path => _assetName;
-
-  String get keyName => 'packages/example_resources/$_assetName';
-}
-
 class RiveGenImage {
   const RiveGenImage(
     this._assetName, {

examples/example_resources/pubspec.yaml

@@ -11,7 +11,6 @@ dependencies:
     sdk: flutter
 
   flutter_svg: ^2.0.0
-  flare_flutter: ^3.0.0
   rive: ^0.11.0
   lottie: ^2.0.0
 
@@ -25,7 +24,6 @@ flutter_gen:
 
   integrations:
     flutter_svg: true
-    flare_flutter: true
     rive: true
     lottie: true
 

melos.yaml

@@ -80,17 +80,19 @@ scripts:
     description: dart & flutter test
 
   test:dart:
-    run: dart test
+    run: dart test --concurrency=1
     exec:
+      concurrency: 1
       failFast: true
     packageFilters:
       flutter: false
       dependsOn: test
     description: dart test
 
   test:flutter:
-    run: flutter test
+    run: flutter test --concurrency=1
     exec:
+      concurrency: 1
       failFast: true
     packageFilters:
       flutter: true

packages/command/.gitignore

@@ -0,0 +1 @@
+test/lib/gen/

packages/command/bin/flutter_gen_command.dart

@@ -3,10 +3,10 @@ import 'dart:io';
 import 'package:args/args.dart';
 import 'package:flutter_gen_core/flutter_generator.dart';
 import 'package:flutter_gen_core/utils/cast.dart';
+import 'package:flutter_gen_core/utils/error.dart';
 import 'package:flutter_gen_core/version.gen.dart';
 
-
-void main(List<String> args) {
+void main(List<String> args) async {
   final parser = ArgParser();
   parser.addOption(
     'config',
@@ -19,7 +19,6 @@ void main(List<String> args) {
     'build',
     abbr: 'b',
     help: 'Set the path of build.yaml.',
-    defaultsTo: 'build.yaml',
   );
 
   parser.addFlag(
@@ -43,7 +42,7 @@ void main(List<String> args) {
       stdout.writeln(parser.usage);
       return;
     } else if (results.wasParsed('version')) {
-      stdout.writeln('FlutterGen v$packageVersion');
+      stdout.writeln('[FlutterGen] v$packageVersion');
       return;
     }
   } on FormatException catch (e) {
@@ -58,11 +57,15 @@ void main(List<String> args) {
   }
   final pubspecFile = File(pubspecPath).absolute;
 
-  final buildPath = safeCast<String>(results['build']);
-  if (buildPath == null || buildPath.trim().isEmpty) {
+  final buildPath = safeCast<String>(results['build'])?.trim();
+  if (buildPath?.isEmpty ?? false) {
     throw ArgumentError('Invalid value $buildPath', 'build');
   }
-  final buildFile = File(buildPath).absolute;
+  final buildFile = buildPath == null ? null : File(buildPath).absolute;
 
-  FlutterGenerator(pubspecFile, buildFile: buildFile).build();
+  try {
+    await FlutterGenerator(pubspecFile, buildFile: buildFile).build();
+  } on InvalidSettingsException catch (e) {
+    stderr.write(e.message);
+  }
 }