From c34456b3f2f573eb1ae987b0f0f48adecdf7dc1d Mon Sep 17 00:00:00 2001 From: Pasha Stetsenko Date: Mon, 6 Jun 2022 22:33:04 -0700 Subject: [PATCH] chore: Fix some of the remaining lint problems (#1706) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix warnings raised by the avoid_void_async lint rule; Remove rule use_enums, which is not available in Dart 2.16 --- examples/lib/main.dart | 2 +- packages/flame/test/components/button_component_test.dart | 2 +- packages/flame/test/components/hud_button_component_test.dart | 2 +- packages/flame/test/components/hud_margin_component_test.dart | 2 +- .../flame/test/components/sprite_animation_component_test.dart | 2 +- .../test/components/sprite_animation_group_component_test.dart | 2 +- packages/flame/test/components/sprite_component_test.dart | 2 +- packages/flame/test/components/sprite_group_component_test.dart | 2 +- .../flame/test/game/game_widget/game_widget_keyboard_test.dart | 2 +- packages/flame/test/widgets/nine_tile_box_widget_test.dart | 2 +- packages/flame/test/widgets/sprite_animation_widget_test.dart | 2 +- packages/flame/test/widgets/sprite_button_test.dart | 2 +- packages/flame/test/widgets/sprite_widget_test.dart | 2 +- packages/flame_audio/example/lib/main.dart | 2 +- packages/flame_fire_atlas/example/lib/main.dart | 2 +- packages/flame_forge2d/example/lib/main.dart | 2 +- packages/flame_lint/lib/analysis_options.yaml | 1 - 17 files changed, 16 insertions(+), 17 deletions(-) diff --git a/examples/lib/main.dart b/examples/lib/main.dart index 570965b02..7c8dbcb3e 100644 --- a/examples/lib/main.dart +++ b/examples/lib/main.dart @@ -17,7 +17,7 @@ import 'package:examples/stories/utils/utils.dart'; import 'package:examples/stories/widgets/widgets.dart'; import 'package:flutter/material.dart'; -void main() async { +void main() { final dashbook = Dashbook( title: 'Flame Examples', theme: ThemeData.dark(), diff --git a/packages/flame/test/components/button_component_test.dart b/packages/flame/test/components/button_component_test.dart index 1eaefd4b6..46af1729c 100644 --- a/packages/flame/test/components/button_component_test.dart +++ b/packages/flame/test/components/button_component_test.dart @@ -5,7 +5,7 @@ import 'package:flutter_test/flutter_test.dart'; import '../game/flame_game_test.dart'; -void main() async { +void main() { group('ButtonComponent', () { testWithGame( 'correctly registers taps', GameWithTappables.new, (game) async { diff --git a/packages/flame/test/components/hud_button_component_test.dart b/packages/flame/test/components/hud_button_component_test.dart index 3bf70e9c7..a992ca6bb 100644 --- a/packages/flame/test/components/hud_button_component_test.dart +++ b/packages/flame/test/components/hud_button_component_test.dart @@ -7,7 +7,7 @@ import 'package:flutter_test/flutter_test.dart'; import '../game/flame_game_test.dart'; -void main() async { +void main() { group('HudButtonComponent', () { testWithGame( 'correctly registers taps', GameWithTappables.new, (game) async { diff --git a/packages/flame/test/components/hud_margin_component_test.dart b/packages/flame/test/components/hud_margin_component_test.dart index db397f55e..56201cf68 100644 --- a/packages/flame/test/components/hud_margin_component_test.dart +++ b/packages/flame/test/components/hud_margin_component_test.dart @@ -3,7 +3,7 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter/widgets.dart'; import 'package:test/test.dart'; -void main() async { +void main() { group('HudMarginComponent test', () { flameGame.test( 'position set from margin should change onGameResize', diff --git a/packages/flame/test/components/sprite_animation_component_test.dart b/packages/flame/test/components/sprite_animation_component_test.dart index 392178a74..8bae86dda 100644 --- a/packages/flame/test/components/sprite_animation_component_test.dart +++ b/packages/flame/test/components/sprite_animation_component_test.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame_test/flame_test.dart'; import 'package:test/test.dart'; -void main() async { +Future main() async { // Generate an image final image = await generateImage(); diff --git a/packages/flame/test/components/sprite_animation_group_component_test.dart b/packages/flame/test/components/sprite_animation_group_component_test.dart index 2d4e4d9b4..5cf753132 100644 --- a/packages/flame/test/components/sprite_animation_group_component_test.dart +++ b/packages/flame/test/components/sprite_animation_group_component_test.dart @@ -7,7 +7,7 @@ enum _AnimationState { running, } -void main() async { +Future main() async { // Generate a image final image = await generateImage(); diff --git a/packages/flame/test/components/sprite_component_test.dart b/packages/flame/test/components/sprite_component_test.dart index 927738aba..6de8b6020 100644 --- a/packages/flame/test/components/sprite_component_test.dart +++ b/packages/flame/test/components/sprite_component_test.dart @@ -2,7 +2,7 @@ import 'package:flame/components.dart'; import 'package:flame_test/flame_test.dart'; import 'package:test/test.dart'; -void main() async { +Future main() async { final image = await generateImage(); group('SpriteComponent', () { diff --git a/packages/flame/test/components/sprite_group_component_test.dart b/packages/flame/test/components/sprite_group_component_test.dart index 4fd5f76e8..d7103eb6a 100644 --- a/packages/flame/test/components/sprite_group_component_test.dart +++ b/packages/flame/test/components/sprite_group_component_test.dart @@ -7,7 +7,7 @@ enum _SpriteState { running, } -void main() async { +Future main() async { // Generate a image final image = await generateImage(); diff --git a/packages/flame/test/game/game_widget/game_widget_keyboard_test.dart b/packages/flame/test/game/game_widget/game_widget_keyboard_test.dart index 64d5e5134..1e6aad6e5 100644 --- a/packages/flame/test/game/game_widget/game_widget_keyboard_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_keyboard_test.dart @@ -75,7 +75,7 @@ class _GamePage extends StatelessWidget { } } -void main() async { +void main() { final size = Vector2(1.0, 1.0); testWidgets('adds focus', (tester) async { diff --git a/packages/flame/test/widgets/nine_tile_box_widget_test.dart b/packages/flame/test/widgets/nine_tile_box_widget_test.dart index 2ceda0765..221bc257a 100644 --- a/packages/flame/test/widgets/nine_tile_box_widget_test.dart +++ b/packages/flame/test/widgets/nine_tile_box_widget_test.dart @@ -6,7 +6,7 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -void main() async { +Future main() async { final image = await generateImage(); group('NineTileBoxWidget', () { diff --git a/packages/flame/test/widgets/sprite_animation_widget_test.dart b/packages/flame/test/widgets/sprite_animation_widget_test.dart index 591a0db63..c8404332b 100644 --- a/packages/flame/test/widgets/sprite_animation_widget_test.dart +++ b/packages/flame/test/widgets/sprite_animation_widget_test.dart @@ -5,7 +5,7 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -void main() async { +Future main() async { final image = await generateImage(); group('SpriteAnimationWidget', () { diff --git a/packages/flame/test/widgets/sprite_button_test.dart b/packages/flame/test/widgets/sprite_button_test.dart index 4ee75e529..968dbe1a1 100644 --- a/packages/flame/test/widgets/sprite_button_test.dart +++ b/packages/flame/test/widgets/sprite_button_test.dart @@ -4,7 +4,7 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -void main() async { +Future main() async { final image = await generateImage(); group('SpriteButton', () { diff --git a/packages/flame/test/widgets/sprite_widget_test.dart b/packages/flame/test/widgets/sprite_widget_test.dart index 570b3a1a2..01f1c966e 100644 --- a/packages/flame/test/widgets/sprite_widget_test.dart +++ b/packages/flame/test/widgets/sprite_widget_test.dart @@ -4,7 +4,7 @@ import 'package:flame_test/flame_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -void main() async { +Future main() async { final image = await generateImage(); group('SpriteWidget', () { diff --git a/packages/flame_audio/example/lib/main.dart b/packages/flame_audio/example/lib/main.dart index c41f29053..78130fe11 100644 --- a/packages/flame_audio/example/lib/main.dart +++ b/packages/flame_audio/example/lib/main.dart @@ -7,7 +7,7 @@ import 'package:flame_audio/audio_pool.dart'; import 'package:flame_audio/flame_audio.dart'; import 'package:flutter/widgets.dart' hide Animation; -void main() async { +void main() { runApp(GameWidget(game: AudioGame())); } diff --git a/packages/flame_fire_atlas/example/lib/main.dart b/packages/flame_fire_atlas/example/lib/main.dart index bdb379b0e..9e31b011f 100644 --- a/packages/flame_fire_atlas/example/lib/main.dart +++ b/packages/flame_fire_atlas/example/lib/main.dart @@ -4,7 +4,7 @@ import 'package:flame/input.dart'; import 'package:flame_fire_atlas/flame_fire_atlas.dart'; import 'package:flutter/material.dart'; -void main() async { +void main() { WidgetsFlutterBinding.ensureInitialized(); final game = ExampleGame(); diff --git a/packages/flame_forge2d/example/lib/main.dart b/packages/flame_forge2d/example/lib/main.dart index d474a7233..770c683c7 100644 --- a/packages/flame_forge2d/example/lib/main.dart +++ b/packages/flame_forge2d/example/lib/main.dart @@ -1,4 +1,4 @@ -void main() async { +void main() { // There will be a new example in here after Google I/O, stay tuned! // If you want to see the previous examples, go to the flame_forge2d section // of https://examples.flame-engine.org diff --git a/packages/flame_lint/lib/analysis_options.yaml b/packages/flame_lint/lib/analysis_options.yaml index a7c620a02..bc4ac9119 100644 --- a/packages/flame_lint/lib/analysis_options.yaml +++ b/packages/flame_lint/lib/analysis_options.yaml @@ -142,7 +142,6 @@ linter: - unnecessary_this - unrelated_type_equality_checks - unsafe_html - - use_enums - use_full_hex_values_for_flutter_colors - use_function_type_syntax_for_parameters - use_if_null_to_convert_nulls_to_bools