diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 448a5eae3..d4c2102fb 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - flutter-version: '3.10.2' + flutter-version: '3.13.0' channel: 'stable' cache: true - uses: bluefireteam/melos-action@main @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - flutter-version: '3.10.2' + flutter-version: '3.13.0' channel: 'stable' - uses: bluefireteam/melos-action@v2 - name: "Analyze" @@ -51,7 +51,7 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - flutter-version: '3.10.2' + flutter-version: '3.13.0' channel: 'stable' cache: true - uses: bluefireteam/melos-action@main diff --git a/doc/flame/examples/lib/anchor.dart b/doc/flame/examples/lib/anchor.dart index ac813941a..48d3d63ae 100644 --- a/doc/flame/examples/lib/anchor.dart +++ b/doc/flame/examples/lib/anchor.dart @@ -38,7 +38,7 @@ class AnchorGame extends FlameGame { radius: 4, position: size / 2, anchor: Anchor.center, - ) + ), ]); } diff --git a/doc/flame/examples/lib/router.dart b/doc/flame/examples/lib/router.dart index 3a8413110..fd91457b8 100644 --- a/doc/flame/examples/lib/router.dart +++ b/doc/flame/examples/lib/router.dart @@ -397,7 +397,7 @@ class PausePage extends Component with TapCallbacks, HasGameRef { alternate: true, infinite: true, ), - ) + ), ], ), ]); diff --git a/doc/tutorials/klondike/app/lib/step4/klondike_game.dart b/doc/tutorials/klondike/app/lib/step4/klondike_game.dart index 52eb91646..8a200772c 100644 --- a/doc/tutorials/klondike/app/lib/step4/klondike_game.dart +++ b/doc/tutorials/klondike/app/lib/step4/klondike_game.dart @@ -61,7 +61,7 @@ class KlondikeGame extends FlameGame { final cards = [ for (var rank = 1; rank <= 13; rank++) - for (var suit = 0; suit < 4; suit++) Card(rank, suit) + for (var suit = 0; suit < 4; suit++) Card(rank, suit), ]; cards.shuffle(); world.addAll(cards); diff --git a/examples/games/trex/lib/trex_game.dart b/examples/games/trex/lib/trex_game.dart index ee9905af9..2cd10dd3f 100644 --- a/examples/games/trex/lib/trex_game.dart +++ b/examples/games/trex/lib/trex_game.dart @@ -59,7 +59,7 @@ class TRexGame extends FlameGame ascent: 23, glyphs: [ for (var i = 0; i < chars.length; i++) - Glyph(chars[i], left: 954.0 + 20 * i, top: 0, width: 20) + Glyph(chars[i], left: 954.0 + 20 * i, top: 0, width: 20), ], ), letterSpacing: 2, diff --git a/examples/lib/stories/bridge_libraries/forge2d/blob_example.dart b/examples/lib/stories/bridge_libraries/forge2d/blob_example.dart index 61b3aa053..a134765bf 100644 --- a/examples/lib/stories/bridge_libraries/forge2d/blob_example.dart +++ b/examples/lib/stories/bridge_libraries/forge2d/blob_example.dart @@ -27,7 +27,8 @@ class BlobExample extends Forge2DGame with TapDetector { ..collideConnected = false; await addAll([ - for (var i = 0; i < 20; i++) BlobPart(i, jointDef, blobRadius, blobCenter) + for (var i = 0; i < 20; i++) + BlobPart(i, jointDef, blobRadius, blobCenter), ]); world.createJoint(ConstantVolumeJoint(world, jointDef)); } diff --git a/examples/lib/stories/bridge_libraries/forge2d/joints/pulley_joint.dart b/examples/lib/stories/bridge_libraries/forge2d/joints/pulley_joint.dart index 0e95422e8..8374da29f 100644 --- a/examples/lib/stories/bridge_libraries/forge2d/joints/pulley_joint.dart +++ b/examples/lib/stories/bridge_libraries/forge2d/joints/pulley_joint.dart @@ -40,7 +40,7 @@ class PulleyJointExample extends Forge2DGame with TapDetector, HasDraggables { firstBox.loaded, secondBox.loaded, firstPulley.loaded, - secondPulley.loaded + secondPulley.loaded, ]); createJoint(firstBox, secondBox); diff --git a/packages/flame/lib/src/camera/behaviors/bounded_position_behavior.dart b/packages/flame/lib/src/camera/behaviors/bounded_position_behavior.dart index 744bba574..343309ea6 100644 --- a/packages/flame/lib/src/camera/behaviors/bounded_position_behavior.dart +++ b/packages/flame/lib/src/camera/behaviors/bounded_position_behavior.dart @@ -60,7 +60,7 @@ class BoundedPositionBehavior extends Component { ); _target = parent! as PositionProvider; } - if (isValidPoint(target.position)) { + if (_target != null && isValidPoint(target.position)) { _previousPosition.setFrom(target.position); } else { _previousPosition.setFrom(_bounds.center); diff --git a/packages/flame/lib/src/sprite_animation.dart b/packages/flame/lib/src/sprite_animation.dart index 014218a18..97e79d698 100644 --- a/packages/flame/lib/src/sprite_animation.dart +++ b/packages/flame/lib/src/sprite_animation.dart @@ -175,7 +175,7 @@ class SpriteAnimation { return SpriteAnimation( [ for (var i = 0; i < sprites.length; i++) - SpriteAnimationFrame(sprites[i], stepTimes[i]) + SpriteAnimationFrame(sprites[i], stepTimes[i]), ], loop: loop, ); @@ -199,7 +199,7 @@ class SpriteAnimation { srcPosition: frameData.srcPosition, ), frameData.stepTime, - ) + ), ], loop: data.loop, ); diff --git a/packages/flame/test/_goldens/align_component_1.png b/packages/flame/test/_goldens/align_component_1.png index 521acb102..69b96dc7b 100644 Binary files a/packages/flame/test/_goldens/align_component_1.png and b/packages/flame/test/_goldens/align_component_1.png differ diff --git a/packages/flame/test/_goldens/clip_component_circle.png b/packages/flame/test/_goldens/clip_component_circle.png index cb1213861..a9b4a96ba 100644 Binary files a/packages/flame/test/_goldens/clip_component_circle.png and b/packages/flame/test/_goldens/clip_component_circle.png differ diff --git a/packages/flame/test/_goldens/clip_component_polygon.png b/packages/flame/test/_goldens/clip_component_polygon.png index a116a5a5e..a1a3587ab 100644 Binary files a/packages/flame/test/_goldens/clip_component_polygon.png and b/packages/flame/test/_goldens/clip_component_polygon.png differ diff --git a/packages/flame/test/_goldens/fixed_size_viewport_test_1.png b/packages/flame/test/_goldens/fixed_size_viewport_test_1.png index 237b748db..b94b8479d 100644 Binary files a/packages/flame/test/_goldens/fixed_size_viewport_test_1.png and b/packages/flame/test/_goldens/fixed_size_viewport_test_1.png differ diff --git a/packages/flame/test/_goldens/has_decorator_1.png b/packages/flame/test/_goldens/has_decorator_1.png index 94794199f..daabf42e0 100644 Binary files a/packages/flame/test/_goldens/has_decorator_1.png and b/packages/flame/test/_goldens/has_decorator_1.png differ diff --git a/packages/flame/test/_goldens/rotate3d_decorator_1.png b/packages/flame/test/_goldens/rotate3d_decorator_1.png index 97b999841..ecb062b9a 100644 Binary files a/packages/flame/test/_goldens/rotate3d_decorator_1.png and b/packages/flame/test/_goldens/rotate3d_decorator_1.png differ diff --git a/packages/flame/test/_goldens/rotate3d_decorator_2.png b/packages/flame/test/_goldens/rotate3d_decorator_2.png index 88a140680..40923f252 100644 Binary files a/packages/flame/test/_goldens/rotate3d_decorator_2.png and b/packages/flame/test/_goldens/rotate3d_decorator_2.png differ diff --git a/packages/flame/test/_goldens/rotate3d_decorator_3.png b/packages/flame/test/_goldens/rotate3d_decorator_3.png index 964902795..41a2bf03c 100644 Binary files a/packages/flame/test/_goldens/rotate3d_decorator_3.png and b/packages/flame/test/_goldens/rotate3d_decorator_3.png differ diff --git a/packages/flame/test/_goldens/shadow3d_decorator_1.png b/packages/flame/test/_goldens/shadow3d_decorator_1.png index de9111bc7..5d5210c45 100644 Binary files a/packages/flame/test/_goldens/shadow3d_decorator_1.png and b/packages/flame/test/_goldens/shadow3d_decorator_1.png differ diff --git a/packages/flame/test/_goldens/shadow3d_decorator_2.png b/packages/flame/test/_goldens/shadow3d_decorator_2.png index 667036776..1ae38de6e 100644 Binary files a/packages/flame/test/_goldens/shadow3d_decorator_2.png and b/packages/flame/test/_goldens/shadow3d_decorator_2.png differ diff --git a/packages/flame/test/_goldens/shadow3d_decorator_3.png b/packages/flame/test/_goldens/shadow3d_decorator_3.png index ae39b5f80..5e30f4206 100644 Binary files a/packages/flame/test/_goldens/shadow3d_decorator_3.png and b/packages/flame/test/_goldens/shadow3d_decorator_3.png differ diff --git a/packages/flame/test/_goldens/text_box_component_test_1.png b/packages/flame/test/_goldens/text_box_component_test_1.png index 82d1ecfc1..88e514c58 100644 Binary files a/packages/flame/test/_goldens/text_box_component_test_1.png and b/packages/flame/test/_goldens/text_box_component_test_1.png differ diff --git a/packages/flame/test/camera/viewports/fixed_size_viewport_test.dart b/packages/flame/test/camera/viewports/fixed_size_viewport_test.dart index f3de7dba1..2c5e8f7f7 100644 --- a/packages/flame/test/camera/viewports/fixed_size_viewport_test.dart +++ b/packages/flame/test/camera/viewports/fixed_size_viewport_test.dart @@ -70,7 +70,7 @@ void main() { position: Vector2(i * 60.0 - i * i.abs() * 3, 0), radius: 25 - i.abs() * 3, anchor: Anchor.center, - ) + ), ]); game.addAll([world, camera]); }, diff --git a/packages/flame/test/collisions/collision_callback_benchmark_test.dart b/packages/flame/test/collisions/collision_callback_benchmark_test.dart index f5765be80..24aa03e45 100644 --- a/packages/flame/test/collisions/collision_callback_benchmark_test.dart +++ b/packages/flame/test/collisions/collision_callback_benchmark_test.dart @@ -70,7 +70,7 @@ void main() { '${1000 / (totalTime / ticks)} runs per second\n' '${_TestBlock.collisionCounter}', ); - } + }, }); }); } diff --git a/packages/flame/test/collisions/collision_detection_test.dart b/packages/flame/test/collisions/collision_detection_test.dart index 2191fb6f3..48e2d7679 100644 --- a/packages/flame/test/collisions/collision_detection_test.dart +++ b/packages/flame/test/collisions/collision_detection_test.dart @@ -1723,7 +1723,7 @@ void main() { final reflectionRay2 = results[1].reflectionRay; expect(reflectionRay2?.origin, Vector2(50, 0)); expect(reflectionRay2?.direction, Vector2(1, 1)..normalize()); - } + }, }); }); } diff --git a/packages/flame/test/collisions/collision_passthrough_test.dart b/packages/flame/test/collisions/collision_passthrough_test.dart index 897b59710..cd2acc2db 100644 --- a/packages/flame/test/collisions/collision_passthrough_test.dart +++ b/packages/flame/test/collisions/collision_passthrough_test.dart @@ -38,7 +38,7 @@ void main() { expect(hitboxParent.startCounter, 1); expect(hitboxParent.endCounter, 1); expect(hitboxParent.onCollisionCounter, 1); - } + }, }); }); } diff --git a/packages/flame/test/collisions/collision_type_test.dart b/packages/flame/test/collisions/collision_type_test.dart index 12b5dc259..1d8d3219d 100644 --- a/packages/flame/test/collisions/collision_type_test.dart +++ b/packages/flame/test/collisions/collision_type_test.dart @@ -300,7 +300,7 @@ void main() { expect(blockB.activeCollisions, {blockA, innerBlockA}); expect(innerBlockA.activeCollisions, {blockB, innerBlockB}); expect(innerBlockB.activeCollisions, {blockA, innerBlockA}); - } + }, }); }); } diff --git a/packages/flame/test/components/component_test.dart b/packages/flame/test/components/component_test.dart index f05dac6b5..16468e246 100644 --- a/packages/flame/test/components/component_test.dart +++ b/packages/flame/test/components/component_test.dart @@ -1046,7 +1046,7 @@ void main() { } matchComponentsAtPoint(Vector2(0, 0), [ - _Pair(game, [Vector2(0, 0)]) + _Pair(game, [Vector2(0, 0)]), ]); matchComponentsAtPoint(Vector2(400, 100), [ _Pair(compA, [Vector2(400, 100), Vector2(25, 25)]), diff --git a/packages/flame/test/components/position_component_test.dart b/packages/flame/test/components/position_component_test.dart index 9d80a5841..1f2ff8965 100644 --- a/packages/flame/test/components/position_component_test.dart +++ b/packages/flame/test/components/position_component_test.dart @@ -798,7 +798,7 @@ void main() { Vector2(0, 1), Vector2.all(2), Vector2(-1, 0), - Vector2.all(-50) + Vector2.all(-50), ]; final expectedAngles = [pi, (3 * pi / 4), (-pi / 2), (-pi / 4)]; @@ -824,7 +824,7 @@ void main() { Vector2(0, 1), Vector2.all(2), Vector2(-1, 0), - Vector2.all(-50) + Vector2.all(-50), ]; final expectedAngles = [pi / 2, (pi / 4), -pi, (-3 * pi / 4)]; @@ -854,9 +854,9 @@ void main() { children: [ component = PositionComponent( nativeAngle: -pi, - ) + ), ], - ) + ), ], ); @@ -864,7 +864,7 @@ void main() { Vector2(0, 1), Vector2.all(2), Vector2(-1, 0), - Vector2.all(-50) + Vector2.all(-50), ]; final expectedAngles = [pi, (3 * pi / 4), -pi / 2, (-pi / 4)]; diff --git a/packages/flame/test/components/rectangle_component_test.dart b/packages/flame/test/components/rectangle_component_test.dart index 49e5ab39a..46813b45e 100644 --- a/packages/flame/test/components/rectangle_component_test.dart +++ b/packages/flame/test/components/rectangle_component_test.dart @@ -19,13 +19,13 @@ void main() { Vector2(0, 0), Vector2(0, 20), Vector2(10, 20), - Vector2(10, 0) + Vector2(10, 0), ]; final size2 = [ Vector2(0, 0), Vector2(0, 40), Vector2(20, 40), - Vector2(20, 0) + Vector2(20, 0), ]; component.size /= 2; @@ -47,13 +47,13 @@ void main() { Vector2(0, 0), Vector2(0, 15), Vector2(15, 15), - Vector2(15, 0) + Vector2(15, 0), ]; final size2 = [ Vector2(0, 0), Vector2(0, 30), Vector2(30, 30), - Vector2(30, 0) + Vector2(30, 0), ]; component.size /= 2; @@ -74,13 +74,13 @@ void main() { Vector2(0, 0), Vector2(0, 30), Vector2(25, 30), - Vector2(25, 0) + Vector2(25, 0), ]; final size2 = [ Vector2(0, 0), Vector2(0, 60), Vector2(50, 60), - Vector2(50, 0) + Vector2(50, 0), ]; component.size /= 2; @@ -102,13 +102,13 @@ void main() { Vector2(0, 0), Vector2(0, 15), Vector2(45, 15), - Vector2(45, 0) + Vector2(45, 0), ]; final size2 = [ Vector2(0, 0), Vector2(0, 30), Vector2(90, 30), - Vector2(90, 0) + Vector2(90, 0), ]; component.size /= 2; 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 050aa8da8..e7e08d36a 100644 --- a/packages/flame/test/components/sprite_animation_group_component_test.dart +++ b/packages/flame/test/components/sprite_animation_group_component_test.dart @@ -237,7 +237,7 @@ Future main() async { final component = SpriteAnimationGroupComponent<_AnimationState>( animations: { _AnimationState.idle: animation1, - _AnimationState.running: animation2 + _AnimationState.running: animation2, }, current: _AnimationState.idle, ); @@ -264,7 +264,7 @@ Future main() async { final component = SpriteAnimationGroupComponent<_AnimationState>( animations: { _AnimationState.idle: animation1, - _AnimationState.running: animation2 + _AnimationState.running: animation2, }, current: _AnimationState.idle, )..autoResize = false; diff --git a/packages/flame/test/events/flame_game_mixins/has_draggable_components_test.dart b/packages/flame/test/events/flame_game_mixins/has_draggable_components_test.dart index 84c24a583..0746fdb19 100644 --- a/packages/flame/test/events/flame_game_mixins/has_draggable_components_test.dart +++ b/packages/flame/test/events/flame_game_mixins/has_draggable_components_test.dart @@ -22,7 +22,7 @@ void main() { onDragStart: (e) => nDragStartCalled++, onDragUpdate: (e) => nDragUpdateCalled++, onDragEnd: (e) => nDragEndCalled++, - ) + ), ], ); await tester.pumpWidget(GameWidget(game: game)); diff --git a/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart b/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart index 75537b5d1..8bed3d7d1 100644 --- a/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart +++ b/packages/flame/test/events/flame_game_mixins/has_tappable_components_test.dart @@ -24,7 +24,7 @@ void main() { onLongTapDown: (e) => nLongTapDown++, onTapCancel: (e) => nTapCancel++, onTapUp: (e) => nTapUp++, - ) + ), ], ); await tester.pumpWidget(GameWidget(game: game)); @@ -93,7 +93,7 @@ void main() { }, onTapCancel: (e) => nTapCancelChild++, onTapUp: (e) => nTapUpChild++, - ) + ), ], ), ], @@ -248,7 +248,7 @@ void main() { nTappableCancelled++; return true; }, - ) + ), ], ); await tester.pumpWidget(GameWidget(game: game)); diff --git a/packages/flame/test/game/game_widget/game_widget_test.dart b/packages/flame/test/game/game_widget/game_widget_test.dart index 9a8a8ec5f..43bddca68 100644 --- a/packages/flame/test/game/game_widget/game_widget_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_test.dart @@ -291,7 +291,7 @@ void main() { autofocus: true, child: const SizedBox.shrink(), ); - } + }, }, ), ); @@ -323,7 +323,7 @@ void main() { focusNode: overlayFocusNode, child: const SizedBox.shrink(), ); - } + }, }, ), ); @@ -368,7 +368,7 @@ void main() { autofocus: true, child: const SizedBox.shrink(), ); - } + }, }, ), ); @@ -463,7 +463,7 @@ void main() { autofocus: true, child: const SizedBox.shrink(), ); - } + }, }, ), ); diff --git a/packages/flame/test/text/sprite_font_renderer_test.dart b/packages/flame/test/text/sprite_font_renderer_test.dart index 21bb4f4e7..77f6b19ea 100644 --- a/packages/flame/test/text/sprite_font_renderer_test.dart +++ b/packages/flame/test/text/sprite_font_renderer_test.dart @@ -232,7 +232,7 @@ void main() { glyphs: [ for (var j = 0; j < lines.length; j++) for (var i = 0; i < lines[j].length; i++) - Glyph(lines[j][i], left: i * 6, top: 1 + j * 6) + Glyph(lines[j][i], left: i * 6, top: 1 + j * 6), ], ); const colors = [ @@ -303,7 +303,7 @@ Future createRenderer({ glyphs: [ for (var j = 0; j < lines.length; j++) for (var i = 0; i < lines[j].length; i++) - Glyph(lines[j][i], left: i * 6, top: 1 + j * 6) + Glyph(lines[j][i], left: i * 6, top: 1 + j * 6), ], ), scale: scale, diff --git a/packages/flame_forge2d/example/lib/main.dart b/packages/flame_forge2d/example/lib/main.dart index 30aa725b5..71f398668 100644 --- a/packages/flame_forge2d/example/lib/main.dart +++ b/packages/flame_forge2d/example/lib/main.dart @@ -33,7 +33,7 @@ class Forge2DExample extends Forge2DGame { Wall(topLeft, topRight), Wall(topRight, bottomRight), Wall(bottomLeft, bottomRight), - Wall(topLeft, bottomLeft) + Wall(topLeft, bottomLeft), ]; } } diff --git a/packages/flame_forge2d/test/goldens/body_component/circle_shape.png b/packages/flame_forge2d/test/goldens/body_component/circle_shape.png index 829be1aaa..de84575b0 100644 Binary files a/packages/flame_forge2d/test/goldens/body_component/circle_shape.png and b/packages/flame_forge2d/test/goldens/body_component/circle_shape.png differ diff --git a/packages/flame_forge2d/test/goldens/body_component/polygon_shape.png b/packages/flame_forge2d/test/goldens/body_component/polygon_shape.png index 3535f0246..3affb9d15 100644 Binary files a/packages/flame_forge2d/test/goldens/body_component/polygon_shape.png and b/packages/flame_forge2d/test/goldens/body_component/polygon_shape.png differ diff --git a/packages/flame_jenny/jenny/lib/src/dialogue_runner.dart b/packages/flame_jenny/jenny/lib/src/dialogue_runner.dart index e97ddaeb3..94802f871 100644 --- a/packages/flame_jenny/jenny/lib/src/dialogue_runner.dart +++ b/packages/flame_jenny/jenny/lib/src/dialogue_runner.dart @@ -194,7 +194,7 @@ class DialogueRunner { await _combineFutures([ command.execute(this), if (command is UserDefinedCommand) - for (final view in _dialogueViews) view.onCommand(command) + for (final view in _dialogueViews) view.onCommand(command), ]); } diff --git a/packages/flame_lint/lib/analysis_options.yaml b/packages/flame_lint/lib/analysis_options.yaml index eff1696bb..d304737bc 100644 --- a/packages/flame_lint/lib/analysis_options.yaml +++ b/packages/flame_lint/lib/analysis_options.yaml @@ -51,6 +51,7 @@ linter: - cancel_subscriptions - cast_nullable_to_non_nullable - close_sinks + - collection_methods_unrelated_type - comment_references - constant_identifier_names - control_flow_in_finally @@ -68,13 +69,11 @@ linter: - flutter_style_todos - hash_and_equals - implementation_imports - - iterable_contains_unrelated_type - join_return_with_assignment - library_names - library_prefixes - library_private_types_in_public_api - lines_longer_than_80_chars - - list_remove_unrelated_type - literal_only_boolean_expressions - missing_whitespace_between_adjacent_strings - no_adjacent_strings_in_list diff --git a/packages/flame_svg/test/_goldens/render_sharply.png b/packages/flame_svg/test/_goldens/render_sharply.png index 11e59850d..858b27d5c 100644 Binary files a/packages/flame_svg/test/_goldens/render_sharply.png and b/packages/flame_svg/test/_goldens/render_sharply.png differ diff --git a/packages/flame_svg/test/svg_test.dart b/packages/flame_svg/test/svg_test.dart index 6ba0dfcbf..d18979bad 100644 --- a/packages/flame_svg/test/svg_test.dart +++ b/packages/flame_svg/test/svg_test.dart @@ -71,7 +71,7 @@ void main() { size: const Size(300, 300), painter: SvgPainter(flameSvg), ), - ) + ), ], ), ), diff --git a/packages/flame_test/test/golden_debug_text.png b/packages/flame_test/test/golden_debug_text.png index 962dc8c1b..e4647222c 100644 Binary files a/packages/flame_test/test/golden_debug_text.png and b/packages/flame_test/test/golden_debug_text.png differ diff --git a/packages/flame_test/test/golden_test.png b/packages/flame_test/test/golden_test.png index fe5a43e23..0631e16fd 100644 Binary files a/packages/flame_test/test/golden_test.png and b/packages/flame_test/test/golden_test.png differ diff --git a/packages/flame_test/test/golden_test_small.png b/packages/flame_test/test/golden_test_small.png index d9db6958e..2a79b9920 100644 Binary files a/packages/flame_test/test/golden_test_small.png and b/packages/flame_test/test/golden_test_small.png differ diff --git a/packages/flame_tiled/lib/src/tile_atlas.dart b/packages/flame_tiled/lib/src/tile_atlas.dart index 8ea0af91b..05b9760b4 100644 --- a/packages/flame_tiled/lib/src/tile_atlas.dart +++ b/packages/flame_tiled/lib/src/tile_atlas.dart @@ -129,7 +129,7 @@ class TiledAtlas { // parallelize the download of images. await Future.wait([ - ...imageList.map((tiledImage) => Flame.images.load(tiledImage.source!)) + ...imageList.map((tiledImage) => Flame.images.load(tiledImage.source!)), ]); final emptyPaint = Paint(); diff --git a/packages/flame_tiled/test/goldens/orthogonal.png b/packages/flame_tiled/test/goldens/orthogonal.png index 2b2e90306..b4887a73f 100644 Binary files a/packages/flame_tiled/test/goldens/orthogonal.png and b/packages/flame_tiled/test/goldens/orthogonal.png differ diff --git a/packages/flame_tiled/test/tile_atlas_test.dart b/packages/flame_tiled/test/tile_atlas_test.dart index 1fb2645d8..c7097a84c 100644 --- a/packages/flame_tiled/test/tile_atlas_test.dart +++ b/packages/flame_tiled/test/tile_atlas_test.dart @@ -160,7 +160,7 @@ void main() { TiledComponent.load( 'single_tile_map_2.tmx', Vector2(16, 16), - ) + ), ]); final atlas = TiledAtlas.atlasMap.values.first; diff --git a/packages/flame_tiled/test/tiled_test.dart b/packages/flame_tiled/test/tiled_test.dart index bc7d63502..39eb155da 100644 --- a/packages/flame_tiled/test/tiled_test.dart +++ b/packages/flame_tiled/test/tiled_test.dart @@ -118,7 +118,7 @@ void main() { imageNames: ['map-level1.png', 'image1.png'], stringNames: [ 'map.tmx', - 'tiles_custom_path/external_tileset_custom_path.tsx' + 'tiles_custom_path/external_tileset_custom_path.tsx', ], ); @@ -792,7 +792,7 @@ void main() { 'orthogonal', 'isometric', 'hexagonal', - 'staggered' + 'staggered', ]) { group(mapType, () { setUp(() async { @@ -918,7 +918,7 @@ void main() { 'orthogonal', 'isometric', 'hexagonal', - 'staggered' + 'staggered', ]) { group(mapType, () { setUp(() async {