fix: Minor issues due Flutter 3.16 (#2856)

With the last Flutter version, a few issues were introduced in Flame sourcebase. This PR solves that.
flame-engine · Nov 16, 2023 · d51cd58 · d51cd58
1 parent 717363b
commit d51cd58
Show file tree

Hide file tree

Showing 24 changed files with 40 additions and 29 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -9,7 +9,7 @@ on:
 
 
 env:
-  FLUTTER_MIN_VERSION: '3.13.0'
+  FLUTTER_MIN_VERSION: '3.16.0'
 
 jobs:
   # BEGIN LINTING STAGE

diff --git a/examples/lib/stories/bridge_libraries/flame_forge2d/widget_example.dart b/examples/lib/stories/bridge_libraries/flame_forge2d/widget_example.dart
@@ -127,7 +127,7 @@ class _BodyButtonState extends State<BodyButtonWidget> {
             },
             child: const Text(
               'Flying button!',
-              textScaleFactor: 2.0,
+              textScaler: TextScaler.linear(2.0),
             ),
           ),
         ),

diff --git a/examples/pubspec.yaml b/examples/pubspec.yaml
@@ -23,7 +23,7 @@ dependencies:
   flutter:
     sdk: flutter
   google_fonts: ^4.0.4
-  meta: ^1.8.0
+  meta: ^1.9.1
   padracing: ^1.0.0
   provider: ^6.0.5
   rogue_shooter: ^0.1.0
@@ -33,6 +33,12 @@ dev_dependencies:
   flame_lint: ^1.1.1
   test: any
 
+dependency_overrides:
+  # https://github.com/EsotericSoftware/spine-runtimes/issues/2420
+  raw_image_provider:
+    git:
+      url: https://github.com/erickzanardo/flutter_raw_image_provider.git
+
 flutter:
   uses-material-design: true
 

diff --git a/packages/flame/lib/src/experimental/geometry/shapes/rounded_rectangle.dart b/packages/flame/lib/src/experimental/geometry/shapes/rounded_rectangle.dart
@@ -178,8 +178,8 @@ class RoundedRectangle extends Shape {
   @override
   Vector2 nearestPoint(Vector2 point) {
     _tmpResult.setValues(
-      (point.x).clamp(_left, _right),
-      (point.y).clamp(_top, _bottom),
+      point.x.clamp(_left, _right),
+      point.y.clamp(_top, _bottom),
     );
     if (containsPoint(_tmpResult)) {
       return _tmpResult;

diff --git a/packages/flame/pubspec.yaml b/packages/flame/pubspec.yaml
@@ -21,12 +21,12 @@ dependencies:
 
 dev_dependencies:
   canvas_test: ^0.2.0
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
   flame_test: ^1.14.0
   flutter_test:
     sdk: flutter
-  mocktail: ^0.3.0
+  mocktail: ^1.0.1
   test: any
 
 screenshots:

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/game/game_render_box_test.dart b/packages/flame/test/game/game_render_box_test.dart
@@ -9,7 +9,12 @@ class _MockFlameGame extends Mock implements FlameGame {}
 
 class _MockBuildContext extends Mock implements BuildContext {}
 
-class _MockPipelineOwner extends Mock implements PipelineOwner {}
+class _MockPipelineOwner extends Mock implements PipelineOwner {
+  @override
+  String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
+    return '';
+  }
+}
 
 final nodesNeedingCompositingBitsUpdate = <RenderObject>[];
 

diff --git a/packages/flame_audio/pubspec.yaml b/packages/flame_audio/pubspec.yaml
@@ -20,8 +20,8 @@ dependencies:
   synchronized: ^3.1.0
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
   flutter_test:
     sdk: flutter
-  mocktail: ^1.0.0
+  mocktail: ^1.0.1
diff --git a/packages/flame_bloc/pubspec.yaml b/packages/flame_bloc/pubspec.yaml
@@ -20,10 +20,10 @@ dependencies:
   meta: ^1.9.1
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
   flame_test: ^1.14.0
   flutter_lints: ^2.0.1
   flutter_test:
     sdk: flutter
-  mocktail: ^0.3.0
+  mocktail: ^1.0.1
diff --git a/packages/flame_fire_atlas/pubspec.yaml b/packages/flame_fire_atlas/pubspec.yaml
@@ -23,4 +23,4 @@ dev_dependencies:
   flame_lint: ^1.1.1
   flutter_test:
     sdk: flutter
-  mocktail: ^1.0.0
+  mocktail: ^1.0.1
diff --git a/packages/flame_jenny/jenny/pubspec.yaml b/packages/flame_jenny/jenny/pubspec.yaml
@@ -14,6 +14,6 @@ dependencies:
   meta: ^1.9.1
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
   test: any
diff --git a/packages/flame_jenny/pubspec.yaml b/packages/flame_jenny/pubspec.yaml
@@ -21,6 +21,6 @@ dependencies:
   meta: ^1.9.1
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
   test: any
diff --git a/packages/flame_lint/pubspec.yaml b/packages/flame_lint/pubspec.yaml
@@ -11,4 +11,4 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
diff --git a/packages/flame_markdown/pubspec.yaml b/packages/flame_markdown/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
   markdown: ^7.1.1
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
   flutter_test:
     sdk: flutter
diff --git a/packages/flame_network_assets/example/pubspec.yaml b/packages/flame_network_assets/example/pubspec.yaml
@@ -5,7 +5,7 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.18.0 <4.0.0'
+  sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
   flame: ^1.10.1

diff --git a/packages/flame_network_assets/pubspec.yaml b/packages/flame_network_assets/pubspec.yaml
@@ -8,7 +8,7 @@ funding:
   - https://patreon.com/bluefireoss
 
 environment:
-  sdk: '>=2.18.0 <4.0.0'
+  sdk: ">=3.0.0 <4.0.0"
   flutter: ">=1.17.0"
 
 dependencies:
@@ -21,8 +21,8 @@ dependencies:
   path_provider: ^2.0.15
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
   flutter_test:
     sdk: flutter
-  mocktail: ^0.3.0
+  mocktail: ^1.0.1
diff --git a/packages/flame_noise/pubspec.yaml b/packages/flame_noise/pubspec.yaml
@@ -18,7 +18,7 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
   flame_test: ^1.14.0
   test: any
diff --git a/packages/flame_oxygen/pubspec.yaml b/packages/flame_oxygen/pubspec.yaml
@@ -18,5 +18,5 @@ dependencies:
   oxygen: ^0.2.0
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
diff --git a/packages/flame_rive/pubspec.yaml b/packages/flame_rive/pubspec.yaml
@@ -18,7 +18,7 @@ dependencies:
   rive: ^0.12.3
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
   flame_test: ^1.14.0
   flutter_test:

diff --git a/packages/flame_spine/pubspec.yaml b/packages/flame_spine/pubspec.yaml
@@ -16,7 +16,7 @@ dependencies:
   flame: ^1.10.1
   flutter:
     sdk: flutter
-  spine_flutter: ^4.1.2
+  spine_flutter: ^4.2.17
 
 dev_dependencies:
   flame_lint: ^1.1.1

diff --git a/packages/flame_svg/pubspec.yaml b/packages/flame_svg/pubspec.yaml
@@ -18,9 +18,9 @@ dependencies:
   flutter_svg: ^2.0.5
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
   flutter_test:
     sdk: flutter
-  mocktail: ^0.3.0
+  mocktail: ^1.0.1
   test: any
diff --git a/packages/flame_svg/test/_goldens/render_sharply.png b/packages/flame_svg/test/_goldens/render_sharply.png
diff --git a/packages/flame_test/pubspec.yaml b/packages/flame_test/pubspec.yaml
@@ -22,5 +22,5 @@ dependencies:
   vector_math: ^2.1.4
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
diff --git a/packages/flame_tiled/pubspec.yaml b/packages/flame_tiled/pubspec.yaml
@@ -21,7 +21,7 @@ dependencies:
   xml: ^6.3.0
 
 dev_dependencies:
-  dartdoc: ^6.2.2
+  dartdoc: ^6.3.0
   flame_lint: ^1.1.1
   flutter_test:
     sdk: flutter