diff --git a/doc/flame/examples/pubspec.yaml b/doc/flame/examples/pubspec.yaml index 49e4fc9e2..c394b78ea 100644 --- a/doc/flame/examples/pubspec.yaml +++ b/doc/flame/examples/pubspec.yaml @@ -8,10 +8,9 @@ environment: flutter: ^2.10.0 dependencies: + flame: ^1.1.1 flutter: sdk: flutter - flame: - path: ../../../packages/flame dev_dependencies: flame_lint: ^0.0.1 diff --git a/doc/tutorials/klondike/app/lib/step3/rank.dart b/doc/tutorials/klondike/app/lib/step3/rank.dart index a5ac92dd8..663ad67fd 100644 --- a/doc/tutorials/klondike/app/lib/step3/rank.dart +++ b/doc/tutorials/klondike/app/lib/step3/rank.dart @@ -5,7 +5,10 @@ import 'package:klondike/step3/klondike_game.dart'; @immutable class Rank { factory Rank.fromInt(int value) { - assert(value >= 1 && value <= 13); + assert( + value >= 1 && value <= 13, + 'value is outside of the bounds of what a rank can be', + ); return _singletons[value - 1]; } diff --git a/doc/tutorials/klondike/app/lib/step3/suit.dart b/doc/tutorials/klondike/app/lib/step3/suit.dart index 8e5bb36e5..a6229addf 100644 --- a/doc/tutorials/klondike/app/lib/step3/suit.dart +++ b/doc/tutorials/klondike/app/lib/step3/suit.dart @@ -5,7 +5,10 @@ import 'package:klondike/step3/klondike_game.dart'; @immutable class Suit { factory Suit.fromInt(int index) { - assert(index >= 0 && index <= 3); + assert( + index >= 0 && index <= 3, + 'index is outside of the bounds of what a suit can be', + ); return _singletons[index]; } diff --git a/doc/tutorials/klondike/app/pubspec.yaml b/doc/tutorials/klondike/app/pubspec.yaml index 8e9445bc9..2539f977c 100644 --- a/doc/tutorials/klondike/app/pubspec.yaml +++ b/doc/tutorials/klondike/app/pubspec.yaml @@ -7,10 +7,9 @@ environment: sdk: ^2.15.0 dependencies: + flame: ^1.1.1 flutter: sdk: flutter - flame: - path: ../../../../packages/flame dev_dependencies: flame_lint: ^0.0.1 diff --git a/examples/games/padracing/lib/game_over.dart b/examples/games/padracing/lib/game_over.dart index 8d9c0fe8c..2b08d84db 100644 --- a/examples/games/padracing/lib/game_over.dart +++ b/examples/games/padracing/lib/game_over.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart' hide Image, Gradient; - import 'package:padracing/menu_card.dart'; import 'package:padracing/padracing_game.dart'; @@ -29,8 +28,8 @@ class GameOver extends StatelessWidget { ), const SizedBox(height: 10), ElevatedButton( - child: const Text('Restart'), onPressed: game.reset, + child: const Text('Restart'), ), ], ), diff --git a/examples/games/padracing/lib/tire.dart b/examples/games/padracing/lib/tire.dart index 0108d7b3c..d21e81468 100644 --- a/examples/games/padracing/lib/tire.dart +++ b/examples/games/padracing/lib/tire.dart @@ -164,9 +164,8 @@ class Tire extends BodyComponent { if (isTurnableTire && isTurning) { final turnPerTimeStep = _turnSpeedPerSecond * dt; final angleNow = joint.jointAngle(); - final angleToTurn = (desiredAngle - angleNow) - .clamp(-turnPerTimeStep, turnPerTimeStep) - .toDouble(); + final angleToTurn = + (desiredAngle - angleNow).clamp(-turnPerTimeStep, turnPerTimeStep); final angle = angleNow + angleToTurn; joint.setLimits(angle, angle); } else { diff --git a/examples/games/padracing/pubspec.yaml b/examples/games/padracing/pubspec.yaml index 1c20a7225..cba8887b4 100644 --- a/examples/games/padracing/pubspec.yaml +++ b/examples/games/padracing/pubspec.yaml @@ -7,17 +7,17 @@ environment: sdk: ">=2.16.0 <3.0.0" dependencies: - flutter: - sdk: flutter flame: ^1.1.1 flame_forge2d: ^0.11.0 + flutter: + sdk: flutter google_fonts: ^2.3.2 url_launcher: ^6.1.2 dev_dependencies: + flame_lint: ^0.0.1 flutter_test: sdk: flutter - flame_lint: ^0.0.1 flutter: uses-material-design: true diff --git a/examples/games/trex/pubspec.yaml b/examples/games/trex/pubspec.yaml index 83d19ead4..0a8dc53e7 100644 --- a/examples/games/trex/pubspec.yaml +++ b/examples/games/trex/pubspec.yaml @@ -11,7 +11,6 @@ environment: dependencies: flame: ^1.1.1 - google_fonts: ^2.3.2 flutter: sdk: flutter diff --git a/examples/lib/stories/camera_and_viewport/camera_component_example.dart b/examples/lib/stories/camera_and_viewport/camera_component_example.dart index 64338546a..7b555bdc0 100644 --- a/examples/lib/stories/camera_and_viewport/camera_component_example.dart +++ b/examples/lib/stories/camera_and_viewport/camera_component_example.dart @@ -421,7 +421,10 @@ class Ant extends PositionComponent { travelDirection = -travelDirection; } final nextIndex = travelPathNodeIndex + travelDirection; - assert(nextIndex >= 0 && nextIndex < travelPath.length); + assert( + nextIndex >= 0 && nextIndex < travelPath.length, + 'nextIndex is outside of the bounds of travelPath', + ); final nextPosition = travelPath[nextIndex]; var nextAngle = angle = -(nextPosition - position).angleToSigned(Vector2(0, -1)); @@ -480,7 +483,7 @@ class InsectLeg { path = Path(), foot = Vector2.zero() { final ok = placeFoot(Vector2(x1, y1)); - assert(ok); + assert(ok, 'The foot was not properly placed'); } /// Place where the leg is attached to the body diff --git a/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart b/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart index 9602b09f2..54debd3a1 100644 --- a/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart +++ b/examples/lib/stories/camera_and_viewport/coordinate_systems_example.dart @@ -213,26 +213,26 @@ class _CoordinateSystemsState extends State { required bool start, }) { final add = Container( + margin: const EdgeInsets.all(32), child: Center( child: TextButton( child: const Text('+'), onPressed: () => setState(() => blocks[index]++), ), ), - margin: const EdgeInsets.all(32), ); return [ if (start) add, for (int i = 1; i <= blocks[index]; i++) GestureDetector( child: Container( + margin: const EdgeInsets.all(32), child: Center( child: RotatedBox( quarterTurns: rotated ? 1 : 0, child: Text('Block $i'), ), ), - margin: const EdgeInsets.all(32), ), onTap: () => setState(() => blocks[index]--), ), diff --git a/examples/lib/stories/effects/rotate_effect_example.dart b/examples/lib/stories/effects/rotate_effect_example.dart index 73e5ea8c6..035a1d408 100644 --- a/examples/lib/stories/effects/rotate_effect_example.dart +++ b/examples/lib/stories/effects/rotate_effect_example.dart @@ -119,7 +119,7 @@ class Compass extends PositionComponent { class CompassArrow extends PositionComponent { CompassArrow({required double width, required double radius}) - : assert(width <= radius), + : assert(width <= radius, 'The width is larger than the radius'), _radius = radius, _width = width, super(size: Vector2(width, 2 * radius), anchor: Anchor.center); @@ -154,7 +154,7 @@ class CompassArrow extends PositionComponent { class CompassRim extends PositionComponent { CompassRim({required double radius, required double width}) - : assert(radius > width), + : assert(radius > width, 'The width is larger than the radius'), _radius = radius, _width = width, super( diff --git a/examples/lib/stories/experimental/shapes.dart b/examples/lib/stories/experimental/shapes.dart index 6f5e1171c..f08eb3da8 100644 --- a/examples/lib/stories/experimental/shapes.dart +++ b/examples/lib/stories/experimental/shapes.dart @@ -47,7 +47,10 @@ class ShapesExample extends FlameGame { class ShapesComponent extends Component { ShapesComponent(this.shapes, List colors) - : assert(shapes.length == colors.length), + : assert( + shapes.length == colors.length, + 'The shapes and colors lists have to be of the same length', + ), paints = colors .map( (color) => Paint() @@ -70,7 +73,10 @@ class ShapesComponent extends Component { class DotsComponent extends Component { DotsComponent(this.shapes, this.shapeColors) - : assert(shapes.length == shapeColors.length); + : assert( + shapes.length == shapeColors.length, + 'The shapes and shapeColors lists have to be of the same length', + ); final List shapes; final List shapeColors; diff --git a/examples/lib/stories/widgets/sprite_button_example.dart b/examples/lib/stories/widgets/sprite_button_example.dart index 471ae632f..b49dacdfd 100644 --- a/examples/lib/stories/widgets/sprite_button_example.dart +++ b/examples/lib/stories/widgets/sprite_button_example.dart @@ -14,7 +14,7 @@ Widget spriteButtonBuilder(DashbookContext ctx) { pressedSrcPosition: Vector2(0, 20), pressedSrcSize: Vector2(60, 20), onPressed: () { - print('Pressed'); + // Do something }, label: const Text( 'Sprite Button', diff --git a/examples/pubspec.yaml b/examples/pubspec.yaml index 3d89fb557..dfafdf9c8 100644 --- a/examples/pubspec.yaml +++ b/examples/pubspec.yaml @@ -10,17 +10,17 @@ environment: flutter: ">=2.10.0" dependencies: - flame: ^1.1.1 - flame_svg: ^1.2.0 - flame_forge2d: ^0.11.0 dashbook: 0.1.6 - google_fonts: ^2.3.2 + flame: ^1.1.1 + flame_forge2d: ^0.11.0 + flame_svg: ^1.2.0 flutter: sdk: flutter - trex_game: - path: games/trex + google_fonts: ^2.3.2 padracing: path: games/padracing + trex_game: + path: games/trex dev_dependencies: flame_lint: ^0.0.1 diff --git a/packages/flame/example/pubspec.yaml b/packages/flame/example/pubspec.yaml index 62091c044..b9d918198 100644 --- a/packages/flame/example/pubspec.yaml +++ b/packages/flame/example/pubspec.yaml @@ -8,13 +8,11 @@ environment: flutter: ">=2.10.0" dependencies: - flame: - path: ../ + flame: ^1.1.1 flutter: sdk: flutter dev_dependencies: + flame_lint: ^0.0.1 flutter_test: sdk: flutter - flame_lint: - path: ../../flame_lint diff --git a/packages/flame/lib/src/anchor.dart b/packages/flame/lib/src/anchor.dart index ff5921734..ea7f6b234 100644 --- a/packages/flame/lib/src/anchor.dart +++ b/packages/flame/lib/src/anchor.dart @@ -97,7 +97,7 @@ class Anchor { /// /// If you need to convert anchors to serializable data (like JSON), /// use the `toString()` and `valueOf` methods. - static Anchor valueOf(String name) { + factory Anchor.valueOf(String name) { if (_valueNames.containsValue(name)) { return _valueNames.entries.singleWhere((e) => e.value == name).key; } else { diff --git a/packages/flame/lib/src/components/component_set.dart b/packages/flame/lib/src/components/component_set.dart index 193c4b963..e1af4cace 100644 --- a/packages/flame/lib/src/components/component_set.dart +++ b/packages/flame/lib/src/components/component_set.dart @@ -23,7 +23,7 @@ class ComponentSet extends QueryableOrderedSet { ); @Deprecated('Use ComponentSet.new instead; will be removed in 1.3.0') - static ComponentSet createDefault() => ComponentSet(); + ComponentSet.createDefault() : this(); /// Components whose priority changed since the last update. /// diff --git a/packages/flame/lib/src/components/particle_component.dart b/packages/flame/lib/src/components/particle_component.dart index 51217824f..526214960 100644 --- a/packages/flame/lib/src/components/particle_component.dart +++ b/packages/flame/lib/src/components/particle_component.dart @@ -11,6 +11,7 @@ import 'package:flame/src/particles/particle.dart'; class ParticleComponent extends Component { Particle particle; + @Deprecated('Will be removed after v1.1, use ParticleSystemComponent instead') ParticleComponent(this.particle); /// Returns progress of the child [Particle]. diff --git a/packages/flame/lib/src/game/flame_game.dart b/packages/flame/lib/src/game/flame_game.dart index 885e7c796..2fce98414 100644 --- a/packages/flame/lib/src/game/flame_game.dart +++ b/packages/flame/lib/src/game/flame_game.dart @@ -120,7 +120,7 @@ class FlameGame extends Component with Game { var repeat = true; while (repeat) { // Give chance to other futures to execute first - await Future.delayed(const Duration()); + await Future.delayed(Duration.zero); repeat = false; descendants(includeSelf: true).forEach( (Component child) { diff --git a/packages/flame/lib/src/geometry/line.dart b/packages/flame/lib/src/geometry/line.dart index 3aee9c1b1..69e1d316a 100644 --- a/packages/flame/lib/src/geometry/line.dart +++ b/packages/flame/lib/src/geometry/line.dart @@ -11,12 +11,12 @@ class Line { const Line(this.a, this.b, this.c); - static Line fromPoints(Vector2 p1, Vector2 p2) { - final a = p2.y - p1.y; - final b = p1.x - p2.x; - final c = p2.y * p1.x - p1.y * p2.x; - return Line(a, b, c); - } + Line.fromPoints(Vector2 p1, Vector2 p2) + : this( + p2.y - p1.y, + p1.x - p2.x, + p2.y * p1.x - p1.y * p2.x, + ); /// Returns an empty list if there is no intersection /// If the lines are concurrent it returns one point in the list. diff --git a/packages/flame/lib/src/image_composition.dart b/packages/flame/lib/src/image_composition.dart index 32dae385a..987c5f93e 100644 --- a/packages/flame/lib/src/image_composition.dart +++ b/packages/flame/lib/src/image_composition.dart @@ -84,7 +84,7 @@ class ImageComposition { /// Compose all the images into a single composition. Future compose() async { // Rect used to determine how big the output image will be. - var output = const Rect.fromLTWH(0, 0, 0, 0); + var output = Rect.zero; final recorder = PictureRecorder(); final canvas = Canvas(recorder); diff --git a/packages/flame/lib/src/widgets/nine_tile_box.dart b/packages/flame/lib/src/widgets/nine_tile_box.dart index 4468364f7..35c9cf950 100644 --- a/packages/flame/lib/src/widgets/nine_tile_box.dart +++ b/packages/flame/lib/src/widgets/nine_tile_box.dart @@ -107,8 +107,8 @@ class NineTileBoxWidget extends StatelessWidget { destTileSize: destTileSize, width: width, height: height, - child: child, padding: padding, + child: child, ); }, errorBuilder: errorBuilder, @@ -152,8 +152,8 @@ class InternalNineTileBox extends StatelessWidget { destTileSize: destTileSize, ), child: Container( - child: child, padding: padding, + child: child, ), ), ); diff --git a/packages/flame/pubspec.yaml b/packages/flame/pubspec.yaml index 97601c525..1b3c885f4 100644 --- a/packages/flame/pubspec.yaml +++ b/packages/flame/pubspec.yaml @@ -8,19 +8,19 @@ environment: flutter: ">=2.10.0" dependencies: + collection: ^1.15.0 flutter: sdk: flutter meta: ^1.7.0 - collection: ^1.15.0 ordered_set: ^5.0.0 vector_math: ^2.1.1 dev_dependencies: - dartdoc: ^4.1.0 - mocktail: ^0.3.0 canvas_test: ^0.2.0 - flame_test: ^1.4.0 + dartdoc: ^4.1.0 flame_lint: ^0.0.1 - test: any + flame_test: ^1.4.0 flutter_test: sdk: flutter + mocktail: ^0.3.0 + test: any diff --git a/packages/flame/test/collisions/collision_callback_benchmark.dart b/packages/flame/test/collisions/collision_callback_benchmark.dart index c7665499e..8e14a613a 100644 --- a/packages/flame/test/collisions/collision_callback_benchmark.dart +++ b/packages/flame/test/collisions/collision_callback_benchmark.dart @@ -61,6 +61,7 @@ void main() { } final totalTime = DateTime.now().millisecondsSinceEpoch - startTime.millisecondsSinceEpoch; + // ignore:avoid_print print( '$totalTime ms\n' '${1000 / (totalTime / ticks)} runs per second\n' 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 2dbe7c8a8..2244feb68 100644 --- a/packages/flame/test/game/game_widget/game_widget_test.dart +++ b/packages/flame/test/game/game_widget/game_widget_test.dart @@ -69,7 +69,7 @@ FlameTester<_MyGame> myGame({required bool open}) { return FlameTester( _MyGame.new, pumpWidget: (gameWidget, tester) async { - await tester.pumpWidget(_Wrapper(child: gameWidget, open: open)); + await tester.pumpWidget(_Wrapper(open: open, child: gameWidget)); }, ); } diff --git a/packages/flame/test/text/sprite_font_renderer_test.dart b/packages/flame/test/text/sprite_font_renderer_test.dart index a03ac2a76..408746077 100644 --- a/packages/flame/test/text/sprite_font_renderer_test.dart +++ b/packages/flame/test/text/sprite_font_renderer_test.dart @@ -94,7 +94,7 @@ Future createRenderer({ const lines = [ 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz', - '0123456789.,:;—_!?@\$%+-=/*', + r'0123456789.,:;—_!?@$%+-=/*', '#^&()[]{}<>|\\\'"`~←→↑↓ ', ]; return SpriteFontRenderer( diff --git a/packages/flame_audio/example/pubspec.yaml b/packages/flame_audio/example/pubspec.yaml index 9b5aa8a1d..e0c362889 100644 --- a/packages/flame_audio/example/pubspec.yaml +++ b/packages/flame_audio/example/pubspec.yaml @@ -9,16 +9,13 @@ environment: sdk: ">=2.16.0 <3.0.0" dependencies: - flame: - path: ../../flame - flame_audio: - path: ../ + flame: ^1.1.1 + flame_audio: ^1.0.2 flutter: sdk: flutter dev_dependencies: - flame_lint: - path: ../../flame_lint + flame_lint: ^0.0.1 flutter: assets: diff --git a/packages/flame_audio/pubspec.yaml b/packages/flame_audio/pubspec.yaml index f1aa6fbbe..094577a96 100644 --- a/packages/flame_audio/pubspec.yaml +++ b/packages/flame_audio/pubspec.yaml @@ -8,11 +8,11 @@ environment: flutter: ">=2.10.0" dependencies: - flame: ^1.1.1 audioplayers: ^0.20.1 - synchronized: ^3.0.0 + flame: ^1.1.1 flutter: sdk: flutter + synchronized: ^3.0.0 dev_dependencies: dartdoc: ^4.1.0 diff --git a/packages/flame_bloc/example/pubspec.yaml b/packages/flame_bloc/example/pubspec.yaml index b72c7d012..8b4e47bf5 100644 --- a/packages/flame_bloc/example/pubspec.yaml +++ b/packages/flame_bloc/example/pubspec.yaml @@ -9,20 +9,16 @@ environment: sdk: ">=2.16.0 <3.0.0" dependencies: + equatable: ^2.0.3 + flame_bloc: ^1.4.0 flutter: sdk: flutter - cupertino_icons: ^1.0.2 - equatable: ^2.0.3 - flame_bloc: - path: ../ flutter_bloc: ^8.0.1 dev_dependencies: + flame_lint: ^0.0.1 flutter_test: sdk: flutter - flutter_lints: ^1.0.0 - flame_lint: - path: ../../flame_lint flutter: diff --git a/packages/flame_bloc/lib/src/flame_bloc_game.dart b/packages/flame_bloc/lib/src/flame_bloc_game.dart index ec9b17fec..93b9d71bd 100644 --- a/packages/flame_bloc/lib/src/flame_bloc_game.dart +++ b/packages/flame_bloc/lib/src/flame_bloc_game.dart @@ -138,5 +138,6 @@ mixin FlameBloc on FlameGame { class FlameBlocGame extends FlameGame with FlameBloc { /// FlameBlocGame constructor with an optional [Camera] as a parameter to /// FlameGame. + @Deprecated('Use FlameBlocProvider and FlameBlocListener instead') FlameBlocGame({Camera? camera}) : super(camera: camera); } diff --git a/packages/flame_bloc/pubspec.yaml b/packages/flame_bloc/pubspec.yaml index f99c949d9..20ed0b6ce 100644 --- a/packages/flame_bloc/pubspec.yaml +++ b/packages/flame_bloc/pubspec.yaml @@ -8,18 +8,18 @@ environment: flutter: ">=2.10.0" dependencies: + bloc: ^8.0.2 + flame: ^1.1.1 flutter: sdk: flutter - bloc: ^8.0.2 - meta: ^1.7.0 - flame: ^1.1.1 flutter_bloc: ^8.0.1 + meta: ^1.7.0 dev_dependencies: dartdoc: ^4.1.0 + flame_lint: ^0.0.1 + flame_test: ^1.4.0 + flutter_lints: ^1.0.0 flutter_test: sdk: flutter - flutter_lints: ^1.0.0 - flame_test: ^1.4.0 mocktail: ^0.3.0 - flame_lint: ^0.0.1 diff --git a/packages/flame_fire_atlas/example/pubspec.yaml b/packages/flame_fire_atlas/example/pubspec.yaml index 5a0e78e5f..b34d10907 100644 --- a/packages/flame_fire_atlas/example/pubspec.yaml +++ b/packages/flame_fire_atlas/example/pubspec.yaml @@ -9,19 +9,15 @@ environment: sdk: ">=2.16.0 <3.0.0" dependencies: + flame: ^1.1.1 + flame_fire_atlas: ^1.0.2 flutter: sdk: flutter - cupertino_icons: ^0.1.3 - flame: - path: ../../flame - flame_fire_atlas: - path: ../ dev_dependencies: + flame_lint: ^0.0.1 flutter_test: sdk: flutter - flame_lint: - path: ../../flame_lint flutter: uses-material-design: true diff --git a/packages/flame_fire_atlas/lib/flame_fire_atlas.dart b/packages/flame_fire_atlas/lib/flame_fire_atlas.dart index aeee91523..91a32de1c 100644 --- a/packages/flame_fire_atlas/lib/flame_fire_atlas.dart +++ b/packages/flame_fire_atlas/lib/flame_fire_atlas.dart @@ -238,13 +238,13 @@ class FireAtlas { ..['id'] = id ..['imageData'] = imageData ..['selections'] = selectionsJson - ..['tileWidth'] = tileWidth.toDouble() - ..['tileHeight'] = tileHeight.toDouble(); + ..['tileWidth'] = tileWidth + ..['tileHeight'] = tileHeight; return json; } - static FireAtlas _fromJson(Map json) { + factory FireAtlas._fromJson(Map json) { final tileHeight = json['tileHeight'] as num?; final tileWidth = json['tileWidth'] as num?; final tileSize = json['tileSize'] as num? ?? 0; @@ -297,15 +297,17 @@ class FireAtlas { } /// Reads a [FireAtlas] instance from a byte array. - static FireAtlas deserialize(List bytes) { + factory FireAtlas.deserialize(List bytes) { final unzippedBytes = GZipDecoder().decodeBytes(bytes); final unzippedString = utf8.decode(unzippedBytes); - return _fromJson(jsonDecode(unzippedString) as Map); + return FireAtlas._fromJson( + jsonDecode(unzippedString) as Map, + ); } Image _assertImageLoaded() { if (_image == null) { - throw 'Atlas is not loaded yet, call "load" before using it'; + throw Exception('Atlas is not loaded yet, call "load" before using it'); } return _image!; diff --git a/packages/flame_fire_atlas/pubspec.yaml b/packages/flame_fire_atlas/pubspec.yaml index bfbe62288..a397c941c 100644 --- a/packages/flame_fire_atlas/pubspec.yaml +++ b/packages/flame_fire_atlas/pubspec.yaml @@ -8,14 +8,14 @@ environment: flutter: ">=2.10.0" dependencies: + archive: ^3.1.5 + flame: ^1.1.1 flutter: sdk: flutter - flame: ^1.1.1 - archive: ^3.1.5 dev_dependencies: + dartdoc: ^4.1.0 + flame_lint: ^0.0.1 flutter_test: sdk: flutter - flame_lint: ^0.0.1 mocktail: ^0.3.0 - dartdoc: ^4.1.0 diff --git a/packages/flame_forge2d/example/pubspec.yaml b/packages/flame_forge2d/example/pubspec.yaml index fb7aee373..cac548fd9 100644 --- a/packages/flame_forge2d/example/pubspec.yaml +++ b/packages/flame_forge2d/example/pubspec.yaml @@ -10,18 +10,15 @@ environment: flutter: ">=2.10.0" dependencies: + dashbook: ^0.1.6 + flame_forge2d: ^0.11.0 flutter: sdk: flutter - flame_forge2d: - path: ../ - dashbook: ^0.1.6 dev_dependencies: + flame_lint: ^0.0.1 flutter_test: sdk: flutter - flame_lint: - path: ../../flame_lint - flutter: uses-material-design: true diff --git a/packages/flame_forge2d/pubspec.yaml b/packages/flame_forge2d/pubspec.yaml index 88392cb4a..772fe3a40 100644 --- a/packages/flame_forge2d/pubspec.yaml +++ b/packages/flame_forge2d/pubspec.yaml @@ -16,8 +16,8 @@ dependencies: dev_dependencies: dartdoc: ^4.1.0 flame_lint: ^0.0.1 + flame_test: ^1.4.0 flutter_test: sdk: flutter - flame_test: ^1.4.0 mocktail: ^0.3.0 test: any diff --git a/packages/flame_lint/lib/analysis_options.yaml b/packages/flame_lint/lib/analysis_options.yaml index 9d26fdc52..a7c620a02 100644 --- a/packages/flame_lint/lib/analysis_options.yaml +++ b/packages/flame_lint/lib/analysis_options.yaml @@ -26,6 +26,7 @@ linter: - avoid_init_to_null - avoid_js_rounded_ints - avoid_null_checks_in_equality_operators + - avoid_print - avoid_private_typedef_functions - avoid_redundant_argument_values - avoid_relative_lib_imports @@ -36,6 +37,7 @@ linter: - avoid_type_to_string - avoid_types_as_parameter_names - avoid_unused_constructor_parameters + - avoid_void_async - await_only_futures - camel_case_extensions - camel_case_types @@ -46,6 +48,7 @@ linter: - constant_identifier_names - control_flow_in_finally - curly_braces_in_flow_control_structures + - deprecated_consistency - directives_ordering - do_not_use_environment - empty_catches @@ -69,6 +72,8 @@ linter: - no_duplicate_case_values - no_runtimeType_toString - non_constant_identifier_names + - noop_primitive_operations + - null_closures - omit_local_variable_types - package_api_docs - package_names @@ -82,6 +87,7 @@ linter: - prefer_const_constructors_in_immutables - prefer_const_declarations - prefer_const_literals_to_create_immutables + - prefer_constructors_over_static_methods - prefer_contains - prefer_equal_for_default_values - prefer_final_fields @@ -109,6 +115,8 @@ linter: - recursive_getters - require_trailing_commas - slash_for_doc_comments + - sort_child_properties_last + - sort_pub_dependencies - sort_unnamed_constructors_first - test_types_in_equals - throw_in_finally @@ -117,6 +125,7 @@ linter: - unnecessary_await_in_return - unnecessary_brace_in_string_interps - unnecessary_const + - unnecessary_constructor_name - unnecessary_getters_setters - unnecessary_lambdas - unnecessary_new @@ -133,11 +142,15 @@ 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 - use_is_even_rather_than_modulo - use_key_in_widget_constructors + - use_late_for_private_fields_and_variables + - use_named_constants + - use_raw_strings - use_rethrow_when_possible - use_test_throws_matchers - valid_regexps diff --git a/packages/flame_oxygen/example/pubspec.yaml b/packages/flame_oxygen/example/pubspec.yaml index 3f26d161b..d27b8b388 100644 --- a/packages/flame_oxygen/example/pubspec.yaml +++ b/packages/flame_oxygen/example/pubspec.yaml @@ -9,16 +9,13 @@ environment: sdk: ">=2.16.0 <3.0.0" dependencies: + flame: ^1.1.1 + flame_oxygen: ^0.1.2 flutter: sdk: flutter - flame: - path: ../../flame - flame_oxygen: - path: ../ dev_dependencies: - flame_lint: - path: ../../flame_lint + flame_lint: ^0.0.1 flutter: uses-material-design: true diff --git a/packages/flame_oxygen/pubspec.yaml b/packages/flame_oxygen/pubspec.yaml index de7d4a16a..b41003d4a 100644 --- a/packages/flame_oxygen/pubspec.yaml +++ b/packages/flame_oxygen/pubspec.yaml @@ -8,9 +8,9 @@ environment: flutter: ">=2.10.0" dependencies: + flame: ^1.1.1 flutter: sdk: flutter - flame: ^1.1.1 oxygen: ^0.2.0 dev_dependencies: diff --git a/packages/flame_rive/example/pubspec.yaml b/packages/flame_rive/example/pubspec.yaml index 5e907be7a..ba9e0a45e 100644 --- a/packages/flame_rive/example/pubspec.yaml +++ b/packages/flame_rive/example/pubspec.yaml @@ -7,19 +7,16 @@ environment: sdk: ">=2.16.0 <3.0.0" dependencies: - rive: 0.8.4 - flame_rive: - path: ../ - flame: - path: ../../flame + flame: ^1.1.1 + flame_rive: ^1.2.0 flutter: sdk: flutter + rive: 0.8.4 dev_dependencies: + flame_lint: ^0.0.1 flutter_test: sdk: flutter - flame_lint: - path: ../../flame_lint flutter: uses-material-design: true diff --git a/packages/flame_rive/pubspec.yaml b/packages/flame_rive/pubspec.yaml index 8d26b9d1b..ba8043106 100644 --- a/packages/flame_rive/pubspec.yaml +++ b/packages/flame_rive/pubspec.yaml @@ -9,12 +9,12 @@ environment: dependencies: flame: ^1.1.1 - rive: ^0.8.4 flutter: sdk: flutter + rive: ^0.8.4 dev_dependencies: dartdoc: ^4.1.0 + flame_lint: ^0.0.1 flutter_test: sdk: flutter - flame_lint: ^0.0.1 diff --git a/packages/flame_svg/example/pubspec.yaml b/packages/flame_svg/example/pubspec.yaml index c180df52d..31bbe8d80 100644 --- a/packages/flame_svg/example/pubspec.yaml +++ b/packages/flame_svg/example/pubspec.yaml @@ -9,17 +9,15 @@ environment: sdk: ">=2.16.0 <3.0.0" dependencies: + flame: ^1.1.1 + flame_svg: ^1.2.0 flutter: sdk: flutter - flame: ^1.1.1 - flame_svg: - path: ../ dev_dependencies: + flame_lint: ^0.0.1 flutter_test: sdk: flutter - flame_lint: - path: ../../flame_lint flutter: uses-material-design: true diff --git a/packages/flame_svg/pubspec.yaml b/packages/flame_svg/pubspec.yaml index d28ba4cc3..56d411ee5 100644 --- a/packages/flame_svg/pubspec.yaml +++ b/packages/flame_svg/pubspec.yaml @@ -9,12 +9,12 @@ environment: dependencies: flame: ^1.1.1 - flutter_svg: ^1.0.3 flutter: sdk: flutter + flutter_svg: ^1.0.3 dev_dependencies: dartdoc: ^4.1.0 flame_lint: ^0.0.1 - test: ^1.17.12 mocktail: ^0.3.0 + test: ^1.17.12 diff --git a/packages/flame_test/example/pubspec.yaml b/packages/flame_test/example/pubspec.yaml index 4fb6ff340..953f8f518 100644 --- a/packages/flame_test/example/pubspec.yaml +++ b/packages/flame_test/example/pubspec.yaml @@ -8,13 +8,13 @@ environment: sdk: ">=2.16.0 <3.0.0" dependencies: + flame: ^1.1.1 flutter: sdk: flutter - flame: ^1.1.1 + dev_dependencies: - flame_test: - path: ../ flame_lint: ^0.0.1 + flame_test: ^1.4.0 flutter: assets: diff --git a/packages/flame_test/lib/src/random_test.dart b/packages/flame_test/lib/src/random_test.dart index a2089f251..c2d5358eb 100644 --- a/packages/flame_test/lib/src/random_test.dart +++ b/packages/flame_test/lib/src/random_test.dart @@ -42,7 +42,7 @@ void testRandom( int? retry, int repeatCount = 1, }) { - assert(repeatCount > 0); + assert(repeatCount > 0, 'repeatCount needs to be a positive number'); for (var i = 0; i < repeatCount; i++) { final seed0 = seed ?? _seedGenerator.nextInt(_maxSeed); test( diff --git a/packages/flame_test/test/fails_assert_test.dart b/packages/flame_test/test/fails_assert_test.dart index 9054024da..65a10d64e 100644 --- a/packages/flame_test/test/fails_assert_test.dart +++ b/packages/flame_test/test/fails_assert_test.dart @@ -6,6 +6,7 @@ void main() { test('without message', () { expect( () { + // ignore: prefer_asserts_with_message assert(2 + 2 == 5); }, failsAssert(), diff --git a/packages/flame_test/test/flame_async_test.dart b/packages/flame_test/test/flame_async_test.dart index 00a2ad8ce..65a792af6 100644 --- a/packages/flame_test/test/flame_async_test.dart +++ b/packages/flame_test/test/flame_async_test.dart @@ -6,7 +6,7 @@ void main() { var instructions = 0; tearDown(() { - assert(instructions == 9); + assert(instructions == 9, 'There should be exactly 9 instructions'); }); flameGame.test( 'runs all the async tests', diff --git a/packages/flame_tiled/example/pubspec.yaml b/packages/flame_tiled/example/pubspec.yaml index 0a4828d7a..be8bae9f8 100644 --- a/packages/flame_tiled/example/pubspec.yaml +++ b/packages/flame_tiled/example/pubspec.yaml @@ -8,8 +8,7 @@ environment: dependencies: flame: ^1.1.1 - flame_tiled: - path: ../ + flame_tiled: ^1.4.0 flutter: sdk: flutter diff --git a/packages/flame_tiled/pubspec.yaml b/packages/flame_tiled/pubspec.yaml index 0189d6b00..6ffd02658 100644 --- a/packages/flame_tiled/pubspec.yaml +++ b/packages/flame_tiled/pubspec.yaml @@ -8,13 +8,13 @@ environment: flutter: ">=2.10.0" dependencies: - flame: ^1.1.1 - tiled: ^0.8.1 - xml: ^5.3.0 - meta: ^1.7.0 collection: ^1.15.0 + flame: ^1.1.1 flutter: sdk: flutter + meta: ^1.7.0 + tiled: ^0.8.1 + xml: ^5.3.0 dev_dependencies: dartdoc: ^4.1.0 diff --git a/tutorials/space_shooter/pubspec.yaml b/tutorials/space_shooter/pubspec.yaml index 536468d52..4cb6cc1ce 100644 --- a/tutorials/space_shooter/pubspec.yaml +++ b/tutorials/space_shooter/pubspec.yaml @@ -9,21 +9,18 @@ environment: sdk: ">=2.12.0 <3.0.0" dependencies: + dashbook: ^0.1.5 + flame: ^1.1.1 flutter: sdk: flutter - cupertino_icons: ^1.0.2 - dashbook: ^0.1.5 - flame: - path: ../../packages/flame - flutter_markdown: ^0.6.7 flutter_highlight: ^0.7.0 + flutter_markdown: ^0.6.7 dev_dependencies: + flame_lint: ^0.0.1 + flutter_lints: ^1.0.0 flutter_test: sdk: flutter - flutter_lints: ^1.0.0 - flame_lint: - path: ../../packages/flame_lint flutter: uses-material-design: true