fix: Solve warnings from 3.10.0 analyzer (#2532)

Just solves the warnings that the new Flutter version complains about (which makes us lose 10 points on pub).
flame-engine · May 14, 2023 · b41622d · b41622d
1 parent 7dd2bf7
commit b41622d
Show file tree

Hide file tree

Showing 73 changed files with 138 additions and 141 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -15,12 +15,10 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.7.1'
+          flutter-version: '3.10.0'
           channel: 'stable'
           cache: true
       - uses: bluefireteam/melos-action@main
-        with:
-          melos-version: '3.0.0-dev.0'
       - run: melos run format-check
 
   analyze:
@@ -29,11 +27,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.7.1'
+          flutter-version: '3.10.0'
           channel: 'stable'
       - uses: bluefireteam/melos-action@v2
-        with:
-          melos-version: '3.0.0-dev.0'
       - name: "Analyze"
         uses: invertase/github-action-dart-analyzer@v1
         with:
@@ -58,11 +54,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.7.1'
+          flutter-version: '3.10.0'
           channel: 'stable'
           cache: true
       - uses: bluefireteam/melos-action@main
-        with:
-          melos-version: '3.0.0-dev.0'
       - uses: bluefireteam/spec-action@main
   # END TESTING STAGE
diff --git a/doc/flame/examples/pubspec.yaml b/doc/flame/examples/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: none
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
   flutter: ">=3.3.0"
 
 dependencies:

diff --git a/doc/tutorials/klondike/app/pubspec.yaml b/doc/tutorials/klondike/app/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: none
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
   flame: ^1.7.3

diff --git a/doc/tutorials/platformer/app/pubspec.yaml b/doc/tutorials/platformer/app/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
   flame: ^1.7.3

diff --git a/doc/tutorials/space_shooter/app/pubspec.yaml b/doc/tutorials/space_shooter/app/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
   flame: ^1.7.3

diff --git a/examples/games/padracing/pubspec.yaml b/examples/games/padracing/pubspec.yaml
@@ -1,19 +1,19 @@
 name: padracing
 description: A sample game featuring Flame and Forge2D for DartPad
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
-  collection: ^1.16.0
+  collection: ^1.17.1
   flame: ^1.7.3
   flame_forge2d: ^0.13.0+1
   flutter:
     sdk: flutter
-  google_fonts: ^2.3.2
-  url_launcher: ^6.1.2
+  google_fonts: ^4.0.4
+  url_launcher: ^6.1.11
 
 dev_dependencies:
   flame_lint: ^0.2.0+2

diff --git a/examples/games/rogue_shooter/pubspec.yaml b/examples/games/rogue_shooter/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
   flutter: ">=3.3.0"
 
 dependencies:

diff --git a/examples/games/trex/pubspec.yaml b/examples/games/trex/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: 'none'
 version: 0.1.0
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
   flutter: ">=3.3.0"
 
 dependencies:

diff --git a/examples/lib/stories/animations/animation_group_example.dart b/examples/lib/stories/animations/animation_group_example.dart
@@ -18,7 +18,7 @@ class AnimationGroupExample extends FlameGame with TapDetector {
     back to the original animation.
   ''';
 
-  late SpriteAnimationGroupComponent robot;
+  late SpriteAnimationGroupComponent<RobotState> robot;
 
   @override
   Future<void> onLoad() async {

diff --git a/examples/lib/stories/bridge_libraries/flame_isolate/simple_isolate_example.dart b/examples/lib/stories/bridge_libraries/flame_isolate/simple_isolate_example.dart
@@ -22,7 +22,7 @@ class SimpleIsolateExample extends FlameGame {
   ''';
 
   @override
-  Future onLoad() async {
+  Future<void> onLoad() async {
     camera.viewport = FixedResolutionViewport(Vector2(400, 600));
 
     const rect = Rect.fromLTRB(80, 230, 320, 470);
@@ -86,7 +86,7 @@ class CalculatePrimeNumber extends PositionComponent
   }
 
   @override
-  Future onMount() {
+  Future<void> onMount() {
     _interval = Timer(0.4, repeat: true, onTick: _checkNextAgainstPrime)
       ..start();
     return super.onMount();
@@ -113,7 +113,7 @@ class CalculatePrimeNumber extends PositionComponent
     _isPrime(_primeStartNumber),
   );
 
-  Future _checkNextAgainstPrime() async {
+  Future<void> _checkNextAgainstPrime() async {
     final nextInt = _primeData.key + 1;
 
     try {

diff --git a/examples/pubspec.yaml b/examples/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: "none"
 version: 0.1.0
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
   flutter: ">=3.3.0"
 
 dependencies:
@@ -22,7 +22,7 @@ dependencies:
   flame_tiled: ^1.10.1
   flutter:
     sdk: flutter
-  google_fonts: ^2.3.2
+  google_fonts: ^4.0.4
   meta: ^1.8.0
   padracing: ^1.0.0
   provider: ^6.0.5

diff --git a/packages/flame/example/pubspec.yaml b/packages/flame/example/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.1.0
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
   flutter: ">=3.3.0"
 
 dependencies:

diff --git a/packages/flame/lib/src/cache/assets_cache.dart b/packages/flame/lib/src/cache/assets_cache.dart
@@ -8,7 +8,7 @@ import 'package:flutter/services.dart' show rootBundle;
 /// It automatically looks for files in the `assets` directory.
 class AssetsCache {
   final String prefix;
-  final Map<String, _Asset> _files = {};
+  final Map<String, _Asset<dynamic>> _files = {};
 
   AssetsCache({this.prefix = 'assets/'});
 

diff --git a/packages/flame/lib/src/components/core/recycled_queue.dart b/packages/flame/lib/src/components/core/recycled_queue.dart
@@ -1,4 +1,3 @@
-import 'dart:collection';
 import 'dart:math';
 
 /// [RecycledQueue] is a simple FIFO queue where the elements are recycled.
@@ -20,7 +19,7 @@ import 'dart:math';
 /// iterator is allowed at a time.
 ///
 /// Internally, the queue is backed by a circular list.
-class RecycledQueue<T extends Disposable> extends IterableMixin<T>
+class RecycledQueue<T extends Disposable> extends Iterable<T>
     implements Iterator<T> {
   RecycledQueue(this.factory, {int initialCapacity = 8})
       : _elements = List.generate(initialCapacity, (i) => factory()),

diff --git a/packages/flame/lib/src/components/text_box_component.dart b/packages/flame/lib/src/components/text_box_component.dart
@@ -81,7 +81,8 @@ class TextBoxComponent<T extends TextRenderer> extends TextComponent {
   })  : _boxConfig = boxConfig ?? TextBoxConfig(),
         _fixedSize = size != null,
         align = align ?? Anchor.topLeft,
-        pixelRatio = pixelRatio ?? window.devicePixelRatio;
+        pixelRatio = pixelRatio ??
+            PlatformDispatcher.instance.views.first.devicePixelRatio;
 
   /// Alignment of the text within its bounding box.
   ///

diff --git a/packages/flame/lib/src/game/game.dart b/packages/flame/lib/src/game/game.dart
@@ -19,7 +19,7 @@ import 'package:meta/meta.dart';
 ///
 /// Methods [update] and [render] need to be implemented in order to connect
 /// your class with the internal game loop.
-abstract class Game {
+abstract mixin class Game {
   /// The cache of all images loaded into the game. This defaults to the global
   /// [Flame.images] cache, but you can replace it with a new cache instance if
   /// needed.

diff --git a/packages/flame/pubspec.yaml b/packages/flame/pubspec.yaml
@@ -8,20 +8,20 @@ funding:
   - https://patreon.com/bluefireoss
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"
   flutter: ">=3.3.0"
 
 dependencies:
-  collection: ^1.15.0
+  collection: ^1.17.1
   flutter:
     sdk: flutter
-  meta: ^1.7.0
+  meta: ^1.9.1
   ordered_set: ^5.0.1
-  vector_math: ^2.1.1
+  vector_math: ^2.1.4
 
 dev_dependencies:
   canvas_test: ^0.2.0
-  dartdoc: ^6.0.1
+  dartdoc: ^6.2.2
   flame_lint: ^0.2.0+2
   flame_test: ^1.10.1
   flutter_test:

diff --git a/packages/flame/test/_goldens/fixed_size_viewport_test_1.png b/packages/flame/test/_goldens/fixed_size_viewport_test_1.png
diff --git a/packages/flame/test/_goldens/has_decorator_1.png b/packages/flame/test/_goldens/has_decorator_1.png
diff --git a/packages/flame/test/_goldens/paint_decorator_blur.png b/packages/flame/test/_goldens/paint_decorator_blur.png
diff --git a/packages/flame/test/_goldens/paint_decorator_grayscale.png b/packages/flame/test/_goldens/paint_decorator_grayscale.png
diff --git a/packages/flame/test/_goldens/paint_decorator_with_blur.png b/packages/flame/test/_goldens/paint_decorator_with_blur.png
diff --git a/packages/flame/test/_goldens/sprite_test_1.png b/packages/flame/test/_goldens/sprite_test_1.png
diff --git a/packages/flame/test/collisions/collision_test_helpers.dart b/packages/flame/test/collisions/collision_test_helpers.dart
@@ -15,15 +15,15 @@ class CollisionDetectionWorld extends World with HasCollisionDetection {}
 @isTest
 Future<void> testCollisionDetectionGame(
   String testName,
-  Future Function(HasCollidablesGame) testBody,
+  Future<void> Function(HasCollidablesGame) testBody,
 ) {
   return testWithGame(testName, HasCollidablesGame.new, testBody);
 }
 
 @isTest
 Future<void> testQuadTreeCollisionDetectionGame(
   String testName,
-  Future Function(HasCollisionDetection) testBody,
+  Future<void> Function(HasCollisionDetection) testBody,
 ) {
   return testWithGame(
     testName,
@@ -39,7 +39,7 @@ Future<void> testQuadTreeCollisionDetectionGame(
 }
 
 Future<void> runCollisionTestRegistry(
-  Map<String, Future Function(HasCollisionDetection)> testRegistry,
+  Map<String, Future<void> Function(HasCollisionDetection)> testRegistry,
 ) async {
   for (final entry in testRegistry.entries) {
     final name = entry.key;

diff --git a/packages/flame_audio/example/pubspec.yaml b/packages/flame_audio/example/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
   flame: ^1.7.3
@@ -16,6 +16,7 @@ dependencies:
 
 dev_dependencies:
   flame_lint: ^0.2.0+2
+
 flutter:
   assets:
     - assets/audio/music/bg_music.ogg

diff --git a/packages/flame_audio/pubspec.yaml b/packages/flame_audio/pubspec.yaml
@@ -9,16 +9,16 @@ funding:
   - https://patreon.com/bluefireoss
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
   flutter: ">=3.3.0"
 
 dependencies:
-  audioplayers: ^4.0.0
+  audioplayers: ^4.0.1
   flame: ^1.7.3
   flutter:
     sdk: flutter
-  synchronized: ^3.0.1
+  synchronized: ^3.1.0
 
 dev_dependencies:
-  dartdoc: ^6.0.1
+  dartdoc: ^6.2.2
   flame_lint: ^0.2.0+2
diff --git a/packages/flame_bloc/example/lib/src/game.dart b/packages/flame_bloc/example/lib/src/game.dart
@@ -29,12 +29,12 @@ class GameView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Column(
+    return const Column(
       children: [
-        const GameStat(),
+        GameStat(),
         Expanded(
           child: Stack(
-            children: const [
+            children: [
               Positioned.fill(child: Game()),
               Positioned(top: 50, right: 10, child: Inventory()),
             ],

diff --git a/packages/flame_bloc/example/pubspec.yaml b/packages/flame_bloc/example/pubspec.yaml
@@ -6,15 +6,15 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
-  equatable: ^2.0.3
+  equatable: ^2.0.5
   flame: ^1.7.3
   flame_bloc: ^1.8.4
   flutter:
     sdk: flutter
-  flutter_bloc: ^8.0.1
+  flutter_bloc: ^8.1.2
 
 dev_dependencies:
   flame_lint: ^0.2.0+2

diff --git a/packages/flame_bloc/pubspec.yaml b/packages/flame_bloc/pubspec.yaml
@@ -8,22 +8,22 @@ funding:
   - https://patreon.com/bluefireoss
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
-  flutter: ">=3.3.0"
+  sdk: ">=2.18.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
-  bloc: ^8.0.2
+  bloc: ^8.1.1
   flame: ^1.7.3
   flutter:
     sdk: flutter
-  flutter_bloc: ^8.0.1
-  meta: ^1.7.0
+  flutter_bloc: ^8.1.2
+  meta: ^1.9.1
 
 dev_dependencies:
-  dartdoc: ^6.0.1
+  dartdoc: ^6.2.2
   flame_lint: ^0.2.0+2
   flame_test: ^1.10.1
-  flutter_lints: ^1.0.0
+  flutter_lints: ^2.0.1
   flutter_test:
     sdk: flutter
   mocktail: ^0.3.0
diff --git a/packages/flame_fire_atlas/example/pubspec.yaml b/packages/flame_fire_atlas/example/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.18.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
   flame: ^1.7.3