Skip to content

Commit 88dd7c7

Browse files
authored
🔥 Removes Flare integration (#618)
## What does this change? `flare_flutter` no longer works on Flutter 3.27. ## Changes along with 1. Make actions to reflect actual test results, the test workflow has not been functioning for at least a few months. 2. Fix some flaky tests about `build.yaml` and standard outputs. 3. Throws the `InvalidSettingsException` when deprecated configs are detected. 4. `build.yaml` will be recognized only when it contains a valid option map entry. ## Type of change - [x] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [x] This change requires a documentation update
1 parent 9efb202 commit 88dd7c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+390
-1037
lines changed

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,22 @@ jobs:
3535
if: startsWith(matrix.os, 'windows')
3636
run: echo "%LOCALAPPDATA%\Pub\Cache\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
3737

38-
- name: Get dependencies for macos and ubuntu
39-
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
38+
- name: Get dependencies
4039
run: |
4140
dart pub global activate melos
4241
melos bootstrap
4342
44-
- name: Get dependencies for Windows
45-
if: startsWith(matrix.os, 'windows')
46-
run: |
47-
dart pub global activate melos
48-
# FIXME: CI randomly fail
49-
melos exec -c 1 -- flutter pub get
50-
melos bootstrap
43+
- name: Run tests for Dart packages
44+
if: startsWith(matrix.os, 'ubuntu')
45+
run: melos test:dart --no-select
5146

52-
- name: Run tests for our dart project.
47+
- name: Run tests for Flutter packages
5348
if: startsWith(matrix.os, 'ubuntu')
54-
run: |
55-
melos test
49+
run: melos test:flutter --no-select
5650

5751
- name: Run coverage
5852
if: startsWith(matrix.os, 'ubuntu')
59-
run: |
60-
melos coverage
53+
run: melos coverage
6154

6255
- uses: codecov/codecov-action@v5
6356
with:

‎README.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ flutter_gen:
148148
# Optional
149149
integrations:
150150
flutter_svg: true
151-
flare_flutter: true
152151
rive: true
153152
lottie: true
154153
@@ -398,11 +397,9 @@ Widget build(BuildContext context) {
398397
| Packages | File extension | Setting | Usage |
399398
|---------------------------------------------------------|----------------|-----------------------|-------------------------------------------|
400399
| [flutter_svg](https://pub.dev/packages/flutter_svg) | .svg | `flutter_svg: true` | Assets.images.icons.paint.**svg()** |
401-
| [flare_flutter](https://pub.dev/packages/flare_flutter) | .flr | `flare_flutter: true` | Assets.flare.penguin.**flare()** |
402-
| [rive](https://pub.dev/packages/rive) | .flr | `rive: true` | Assets.rive.vehicles.**rive()** |
400+
| [rive](https://pub.dev/packages/rive) | .riv | `rive: true` | Assets.rive.vehicles.**rive()** |
403401
| [lottie](https://pub.dev/packages/lottie) | .json, .zip | `lottie: true` | Assets.lottie.hamburgerArrow.**lottie()** |
404402

405-
406403
In other cases, the asset is generated as String class.
407404

408405
```dart

‎analysis_options.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ analyzer:
77
- '**.g.dart'
88
- 'test_resources/**'
99
errors:
10+
deprecated_member_use_from_same_package: ignore
1011
unnecessary_import: error
1112
unawaited_futures: error
1213

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

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// ignore_for_file: type=lint
88
// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use
99

10-
import 'package:flare_flutter/flare_actor.dart' as _flare_actor;
11-
import 'package:flare_flutter/flare_controller.dart' as _flare_controller;
1210
import 'package:flutter/services.dart';
1311
import 'package:flutter/widgets.dart';
1412
import 'package:flutter_svg/flutter_svg.dart' as _svg;
@@ -20,10 +18,10 @@ class $AssetsFlareGen {
2018
const $AssetsFlareGen();
2119

2220
/// File path: assets/flare/Penguin.flr
23-
FlareGenImage get penguin => const FlareGenImage('assets/flare/Penguin.flr');
21+
String get penguin => 'assets/flare/Penguin.flr';
2422

2523
/// List of all assets
26-
List<FlareGenImage> get values => [penguin];
24+
List<String> get values => [penguin];
2725
}
2826

2927
class $AssetsImagesGen {
@@ -386,53 +384,6 @@ class SvgGenImage {
386384
String get keyName => _assetName;
387385
}
388386

389-
class FlareGenImage {
390-
const FlareGenImage(
391-
this._assetName, {
392-
this.flavors = const {},
393-
});
394-
395-
final String _assetName;
396-
final Set<String> flavors;
397-
398-
_flare_actor.FlareActor flare({
399-
String? boundsNode,
400-
String? animation,
401-
BoxFit fit = BoxFit.contain,
402-
Alignment alignment = Alignment.center,
403-
bool isPaused = false,
404-
bool snapToEnd = false,
405-
_flare_controller.FlareController? controller,
406-
_flare_actor.FlareCompletedCallback? callback,
407-
Color? color,
408-
bool shouldClip = true,
409-
bool sizeFromArtboard = false,
410-
String? artboard,
411-
bool antialias = true,
412-
}) {
413-
return _flare_actor.FlareActor(
414-
_assetName,
415-
boundsNode: boundsNode,
416-
animation: animation,
417-
fit: fit,
418-
alignment: alignment,
419-
isPaused: isPaused,
420-
snapToEnd: snapToEnd,
421-
controller: controller,
422-
callback: callback,
423-
color: color,
424-
shouldClip: shouldClip,
425-
sizeFromArtboard: sizeFromArtboard,
426-
artboard: artboard,
427-
antialias: antialias,
428-
);
429-
}
430-
431-
String get path => _assetName;
432-
433-
String get keyName => _assetName;
434-
}
435-
436387
class RiveGenImage {
437388
const RiveGenImage(
438389
this._assetName, {

‎examples/example/lib/main.dart‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,6 @@ void main() async {
3131
mainAxisAlignment: MainAxisAlignment.center,
3232
children: <Widget>[
3333
// Auto generated image from FlutterGen.
34-
SizedBox(
35-
width: 200,
36-
height: 200,
37-
child: MyAssets.flare.penguin.flare(
38-
animation: 'walk',
39-
fit: BoxFit.contain,
40-
),
41-
),
4234
SizedBox(
4335
width: 200,
4436
height: 200,
@@ -105,13 +97,6 @@ void main() async {
10597
fit: BoxFit.contain,
10698
),
10799
),
108-
SizedBox(
109-
width: 200,
110-
height: 200,
111-
child: ResAssets.images.favorite.flare(
112-
shouldClip: false,
113-
),
114-
),
115100
SizedBox(
116101
width: 200,
117102
height: 200,

‎examples/example/pubspec.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ dependencies:
1111
sdk: flutter
1212

1313
flutter_svg: ^2.0.0
14-
flare_flutter: ^3.0.0
1514
rive: ^0.11.0
1615
lottie: ^2.0.0
1716

@@ -31,7 +30,6 @@ flutter_gen:
3130

3231
integrations:
3332
flutter_svg: true
34-
flare_flutter: true
3533
rive: true
3634
lottie: true
3735

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

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// ignore_for_file: type=lint
88
// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use
99

10-
import 'package:flare_flutter/flare_actor.dart' as _flare_actor;
11-
import 'package:flare_flutter/flare_controller.dart' as _flare_controller;
1210
import 'package:flutter/services.dart';
1311
import 'package:flutter/widgets.dart';
1412
import 'package:flutter_svg/flutter_svg.dart' as _svg;
@@ -23,8 +21,7 @@ class $AssetsImagesGen {
2321
SvgGenImage get dart => const SvgGenImage('assets/images/dart.svg');
2422

2523
/// File path: assets/images/favorite.flr
26-
FlareGenImage get favorite =>
27-
const FlareGenImage('assets/images/favorite.flr');
24+
String get favorite => 'assets/images/favorite.flr';
2825

2926
/// File path: assets/images/flutter3.jpg
3027
AssetGenImage get flutter3 =>
@@ -227,55 +224,6 @@ class SvgGenImage {
227224
String get keyName => 'packages/example_resources/$_assetName';
228225
}
229226

230-
class FlareGenImage {
231-
const FlareGenImage(
232-
this._assetName, {
233-
this.flavors = const {},
234-
});
235-
236-
final String _assetName;
237-
final Set<String> flavors;
238-
239-
static const String package = 'example_resources';
240-
241-
_flare_actor.FlareActor flare({
242-
String? boundsNode,
243-
String? animation,
244-
BoxFit fit = BoxFit.contain,
245-
Alignment alignment = Alignment.center,
246-
bool isPaused = false,
247-
bool snapToEnd = false,
248-
_flare_controller.FlareController? controller,
249-
_flare_actor.FlareCompletedCallback? callback,
250-
Color? color,
251-
bool shouldClip = true,
252-
bool sizeFromArtboard = false,
253-
String? artboard,
254-
bool antialias = true,
255-
}) {
256-
return _flare_actor.FlareActor(
257-
'packages/example_resources/$_assetName',
258-
boundsNode: boundsNode,
259-
animation: animation,
260-
fit: fit,
261-
alignment: alignment,
262-
isPaused: isPaused,
263-
snapToEnd: snapToEnd,
264-
controller: controller,
265-
callback: callback,
266-
color: color,
267-
shouldClip: shouldClip,
268-
sizeFromArtboard: sizeFromArtboard,
269-
artboard: artboard,
270-
antialias: antialias,
271-
);
272-
}
273-
274-
String get path => _assetName;
275-
276-
String get keyName => 'packages/example_resources/$_assetName';
277-
}
278-
279227
class RiveGenImage {
280228
const RiveGenImage(
281229
this._assetName, {

‎examples/example_resources/pubspec.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ dependencies:
1111
sdk: flutter
1212

1313
flutter_svg: ^2.0.0
14-
flare_flutter: ^3.0.0
1514
rive: ^0.11.0
1615
lottie: ^2.0.0
1716

@@ -25,7 +24,6 @@ flutter_gen:
2524

2625
integrations:
2726
flutter_svg: true
28-
flare_flutter: true
2927
rive: true
3028
lottie: true
3129

‎melos.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,19 @@ scripts:
8080
description: dart & flutter test
8181

8282
test:dart:
83-
run: dart test
83+
run: dart test --concurrency=1
8484
exec:
85+
concurrency: 1
8586
failFast: true
8687
packageFilters:
8788
flutter: false
8889
dependsOn: test
8990
description: dart test
9091

9192
test:flutter:
92-
run: flutter test
93+
run: flutter test --concurrency=1
9394
exec:
95+
concurrency: 1
9496
failFast: true
9597
packageFilters:
9698
flutter: true
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test/lib/gen/

0 commit comments

Comments
 (0)