🏷 Null safety support

CHANGELOG.md

@@ -1,6 +1,7 @@
 # CHANGELOG
 
 ## [next]
+ - Migrate to null safety
  - Code improvements and preparing APIs to null-safety
  - BaseComponent removes children marked as shouldRemove during update
  - Use `find` instead of `globstar` pattern in `scripts/lint.sh` as the later isn't enabled by default in bash

doc/examples/animations/lib/main.dart

@@ -19,9 +19,9 @@ void main() async {
 }
 
 class MyGame extends BaseGame with TapDetector {
-  Image chopper;
-  Image creature;
-  SpriteAnimation animation;
+  late Image chopper;
+  late Image creature;
+  late SpriteAnimation animation;
 
   @override
   Future<void> onLoad() async {

doc/examples/animations/pubspec.yaml

@@ -6,7 +6,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-29.10.beta <3.0.0"
+  flutter: ">=1.24.0-10.2.pre"
 
 dependencies:
   flutter:

doc/examples/aseprite/pubspec.yaml

@@ -6,7 +6,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-29.10.beta <3.0.0"
+  flutter: ">=1.24.0-10.2.pre"
 
 dependencies:
   flutter:

doc/examples/composability/lib/main.dart

@@ -44,7 +44,7 @@ class ParentSquare extends Square {
 }
 
 class MyGame extends BaseGame {
-  ParentSquare _parent;
+  late ParentSquare _parent;
 
   @override
   bool debugMode = true;

doc/examples/composability/pubspec.yaml

@@ -6,7 +6,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-29.10.beta <3.0.0"
+  flutter: ">=1.24.0-10.2.pre"
 
 dependencies:
   flutter:

doc/examples/debug/lib/main.dart

@@ -21,7 +21,7 @@ void main() async {
 
 class AndroidComponent extends SpriteComponent {
   static const int SPEED = 150;
-  Vector2 _gameSize;
+  Vector2? _gameSize;
   int xDirection = 1;
   int yDirection = 1;
 
@@ -39,14 +39,14 @@ class AndroidComponent extends SpriteComponent {
     final rect = toRect();
 
     if ((x <= 0 && xDirection == -1) ||
-        (rect.right >= _gameSize.x && xDirection == 1)) {
+        (rect.right >= _gameSize!.x && xDirection == 1)) {
       xDirection = xDirection * -1;
     }
 
     y += yDirection * SPEED * dt;
 
     if ((y <= 0 && yDirection == -1) ||
-        (rect.bottom >= _gameSize.y && yDirection == 1)) {
+        (rect.bottom >= _gameSize!.y && yDirection == 1)) {
       yDirection = yDirection * -1;
     }
   }

doc/examples/debug/pubspec.yaml

@@ -6,7 +6,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-29.10.beta <3.0.0"
+  flutter: ">=1.24.0-10.2.pre"
 
 dependencies:
   flutter:

doc/examples/effects/combined_effects/lib/main.dart

@@ -22,7 +22,7 @@ void main() async {
 }
 
 class MyGame extends BaseGame with TapDetector {
-  Square greenSquare;
+  late Square greenSquare;
 
   MyGame() {
     final green = Paint()..color = const Color(0xAA338833);

doc/examples/effects/combined_effects/pubspec.yaml

@@ -6,7 +6,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-29.10.beta <3.0.0"
+  flutter: ">=1.24.0-10.2.pre"
 
 dependencies:
   flutter:

doc/examples/effects/infinite_effects/lib/main.dart

@@ -1,14 +1,14 @@
+import 'dart:math';
+
 import 'package:flame/effects/move_effect.dart';
-import 'package:flame/effects/scale_effect.dart';
 import 'package:flame/effects/rotate_effect.dart';
-import 'package:flame/gestures.dart';
+import 'package:flame/effects/scale_effect.dart';
 import 'package:flame/extensions/vector2.dart';
 import 'package:flame/flame.dart';
 import 'package:flame/game.dart';
+import 'package:flame/gestures.dart';
 import 'package:flutter/material.dart';
 
-import 'dart:math';
-
 import './square.dart';
 
 void main() async {

doc/examples/effects/infinite_effects/pubspec.yaml

@@ -6,7 +6,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-29.10.beta <3.0.0"
+  flutter: ">=1.24.0-10.2.pre"
 
 dependencies:
   flutter:

doc/examples/effects/sequence_effect/lib/main.dart

@@ -1,13 +1,13 @@
 import 'package:flame/effects/combined_effect.dart';
 import 'package:flame/effects/move_effect.dart';
-import 'package:flame/effects/scale_effect.dart';
 import 'package:flame/effects/rotate_effect.dart';
+import 'package:flame/effects/scale_effect.dart';
 import 'package:flame/effects/sequence_effect.dart';
-import 'package:flame/gestures.dart';
 import 'package:flame/extensions/offset.dart';
 import 'package:flame/extensions/vector2.dart';
 import 'package:flame/flame.dart';
 import 'package:flame/game.dart';
+import 'package:flame/gestures.dart';
 import 'package:flutter/material.dart';
 
 import './square.dart';
@@ -23,18 +23,18 @@ void main() async {
 }
 
 class MyGame extends BaseGame with TapDetector {
-  Square greenSquare;
+  Square? greenSquare;
 
   MyGame() {
     final green = Paint()..color = const Color(0xAA338833);
     greenSquare = Square(green, Vector2.all(100));
-    add(greenSquare);
+    add(greenSquare!);
   }
 
   @override
   void onTapUp(TapUpDetails details) {
     final Vector2 currentTap = details.localPosition.toVector2();
-    greenSquare.clearEffects();
+    greenSquare!.clearEffects();
 
     final move1 = MoveEffect(
       path: [currentTap],
@@ -85,6 +85,6 @@ class MyGame extends BaseGame with TapDetector {
       isAlternating: true,
     );
     sequence.onComplete = () => print("sequence complete");
-    greenSquare.addEffect(sequence);
+    greenSquare!.addEffect(sequence);
   }
 }

doc/examples/effects/sequence_effect/pubspec.yaml

@@ -6,7 +6,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-29.10.beta <3.0.0"
+  flutter: ">=1.24.0-10.2.pre"
 
 dependencies:
   flutter:

doc/examples/effects/simple/lib/main_move.dart

@@ -8,7 +8,7 @@ import 'package:flame/extensions/offset.dart';
 import './square.dart';
 
 class MyGame extends BaseGame with TapDetector {
-  Square square;
+  late Square square;
 
   MyGame() {
     add(square = Square()

doc/examples/effects/simple/lib/main_rotate.dart

@@ -9,7 +9,7 @@ import 'package:flame/effects/effects.dart';
 import './square.dart';
 
 class MyGame extends BaseGame with TapDetector {
-  Square square;
+  late Square square;
 
   MyGame() {
     add(square = Square()

doc/examples/effects/simple/lib/main_scale.dart

@@ -1,14 +1,14 @@
-import 'package:flutter/material.dart';
-import 'package:flame/game.dart';
-import 'package:flame/gestures.dart';
 import 'package:flame/anchor.dart';
-import 'package:flame/extensions/vector2.dart';
 import 'package:flame/effects/effects.dart';
+import 'package:flame/extensions/vector2.dart';
+import 'package:flame/game.dart';
+import 'package:flame/gestures.dart';
+import 'package:flutter/material.dart';
 
 import './square.dart';
 
 class MyGame extends BaseGame with TapDetector {
-  Square square;
+  late Square square;
   bool grow = true;
 
   MyGame() {

doc/examples/effects/simple/pubspec.yaml

@@ -6,7 +6,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-29.10.beta <3.0.0"
+  flutter: ">=1.24.0-10.2.pre"
 
 dependencies:
   flutter:

doc/examples/gestures/lib/main.dart

@@ -22,7 +22,7 @@ class MyGame extends BaseGame
   @override
   Color backgroundColor() => const Color(0xFFF1F1F1);
 
-  Paint _paint;
+  late Paint _paint;
 
   Rect _rect = const Rect.fromLTWH(50, 50, 50, 50);
 

doc/examples/gestures/lib/main_draggables.dart

@@ -24,7 +24,7 @@ class DraggableSquare extends PositionComponent with Draggable {
   bool debugMode = true;
   bool _isDragging = false;
 
-  DraggableSquare({Vector2 position}) {
+  DraggableSquare({Vector2? position}) {
     size = Vector2.all(100);
     this.position = position ?? Vector2.all(100);
   }
@@ -35,7 +35,7 @@ class DraggableSquare extends PositionComponent with Draggable {
     debugColor = _isDragging ? Colors.greenAccent : Colors.purple;
   }
 
-  Vector2 dragDeltaPosition;
+  Vector2 dragDeltaPosition = Vector2.zero();
   @override
   bool onReceiveDrag(DragEvent event) {
     event.onUpdate = (DragUpdateDetails details) {

doc/examples/gestures/lib/main_mouse_movement.dart

@@ -17,7 +17,7 @@ class MyGame extends BaseGame with MouseMovementDetector {
   static const SPEED = 200;
 
   Vector2 position = Vector2(0, 0);
-  Vector2 target;
+  Vector2? target;
 
   final Paint _blue = Paint()..color = const Color(0xFF0000FF);
 
@@ -48,10 +48,10 @@ class MyGame extends BaseGame with MouseMovementDetector {
   void update(double dt) {
     super.update(dt);
     if (target != null) {
-      _onTarget = _toRect().contains(target.toOffset());
+      _onTarget = _toRect().contains(target!.toOffset());
 
       if (!_onTarget) {
-        final dir = (target - position).normalized();
+        final dir = (target! - position).normalized();
         position += dir * (SPEED * dt);
       }
     }

doc/examples/gestures/lib/main_multitap.dart

@@ -15,7 +15,7 @@ void main() {
 class MyGame extends BaseGame with MultiTouchTapDetector {
   final _whitePaint = BasicPalette.white.paint;
 
-  Paint _paint;
+  Paint? _paint;
 
   final Map<int, Rect> _taps = {};
 
@@ -47,7 +47,7 @@ class MyGame extends BaseGame with MultiTouchTapDetector {
   void render(Canvas canvas) {
     super.render(canvas);
     _taps.values.forEach((rect) {
-      canvas.drawRect(rect, _paint);
+      canvas.drawRect(rect, _paint!);
     });
   }
 }

doc/examples/gestures/lib/main_multitap_advanced.dart

@@ -16,13 +16,13 @@ class MyGame extends BaseGame
     with MultiTouchTapDetector, MultiTouchDragDetector {
   final _whitePaint = BasicPalette.white.paint;
 
-  Paint _paint;
+  Paint? _paint;
 
   final Map<int, Rect> _taps = {};
 
-  Offset _start;
-  Offset _end;
-  Rect _panRect;
+  Offset? _start;
+  Offset? _end;
+  Rect? _panRect;
 
   MyGame() {
     _paint = _whitePaint;
@@ -76,10 +76,10 @@ class MyGame extends BaseGame
   void onPanEnd(DragEndDetails details) {
     if (_start != null && _end != null) {
       _panRect = Rect.fromLTRB(
-        _start.dx,
-        _start.dy,
-        _end.dx,
-        _end.dy,
+        _start!.dx,
+        _start!.dy,
+        _end!.dx,
+        _end!.dy,
       );
     }
   }
@@ -88,11 +88,11 @@ class MyGame extends BaseGame
   void render(Canvas canvas) {
     super.render(canvas);
     _taps.values.forEach((rect) {
-      canvas.drawRect(rect, _paint);
+      canvas.drawRect(rect, _paint!);
     });
 
     if (_panRect != null) {
-      canvas.drawRect(_panRect, _paint);
+      canvas.drawRect(_panRect!, _paint!);
     }
   }
 }

doc/examples/gestures/lib/main_overlapping_tapables.dart

@@ -29,9 +29,9 @@ class TapableSquare extends PositionComponent with Tapable {
     return PaletteEntry(color).paint;
   }
 
-  Paint currentPaint;
+  late Paint currentPaint;
 
-  TapableSquare({Vector2 position}) {
+  TapableSquare({Vector2? position}) {
     currentPaint = _randomPaint();
     size = Vector2.all(100);
     this.position = position ?? Vector2.all(100);