Merge pull request #42 from bluefireteam/feat/updating-to-last-flutter

feat: update to latest flutter
bluefireteam · Jan 23, 2024 · cf88059 · cf88059
2 parents e6c207e + 5c0e531
commit cf88059
Show file tree

Hide file tree

Showing 46 changed files with 977 additions and 418 deletions.
diff --git a/.github/workflows/flame_mini_sprite.yaml b/.github/workflows/flame_mini_sprite.yaml
@@ -31,7 +31,7 @@ jobs:
         run: melos bootstrap
 
       - name: Format
-        run: melos exec --scope flame_mini_sprite flutter format --set-exit-if-changed lib
+        run: melos exec --scope flame_mini_sprite dart format --set-exit-if-changed lib
 
       - name: Analyze
         run: melos exec --scope flame_mini_sprite flutter analyze --fatal-infos --fatal-warnings .

diff --git a/.github/workflows/flutter_mini_sprite.yaml b/.github/workflows/flutter_mini_sprite.yaml
@@ -31,7 +31,7 @@ jobs:
         run: melos bootstrap
 
       - name: Format
-        run: melos exec --scope flutter_mini_sprite flutter format --set-exit-if-changed lib
+        run: melos exec --scope flutter_mini_sprite dart format --set-exit-if-changed lib
 
       - name: Analyze
         run: melos exec --scope flutter_mini_sprite flutter analyze --fatal-infos --fatal-warnings .

diff --git a/.github/workflows/mini_sprite_editor.yaml b/.github/workflows/mini_sprite_editor.yaml
@@ -31,7 +31,7 @@ jobs:
         run: melos bootstrap
 
       - name: Format
-        run: melos exec --scope mini_sprite_editor flutter format --set-exit-if-changed lib
+        run: melos exec --scope mini_sprite_editor dart format --set-exit-if-changed lib
 
       - name: Analyze
         run: melos exec --scope mini_sprite_editor flutter analyze --fatal-infos --fatal-warnings .

diff --git a/.github/workflows/mini_treasure_quest.yaml b/.github/workflows/mini_treasure_quest.yaml
@@ -31,7 +31,7 @@ jobs:
         run: melos bootstrap
 
       - name: Format
-        run: melos exec --scope mini_treasure_quest flutter format --set-exit-if-changed lib
+        run: melos exec --scope mini_treasure_quest dart format --set-exit-if-changed lib
 
       - name: Analyze
         run: melos exec --scope mini_treasure_quest flutter analyze --fatal-infos --fatal-warnings .
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 .DS_Store
-.idea
+.idea
+pubspec_overrides.yaml
+.dart_tool
+melos_mini_sprite_workspace.iml
+.idea/modules.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/packages/flame_mini_sprite/example/lib/main.dart b/packages/flame_mini_sprite/example/lib/main.dart
@@ -20,9 +20,9 @@ class MyGame extends FlameGame {
       palette: [const Color(0xFFFFFFFF)],
     );
 
-    add(SpriteComponent(sprite: sprite, anchor: Anchor.center));
+    world.add(SpriteComponent(sprite: sprite, anchor: Anchor.center));
 
-    add(
+    world.add(
       MiniSpriteComponent(
         position: Vector2(0, 150),
         size: Vector2(150, 150),
@@ -31,7 +31,5 @@ class MyGame extends FlameGame {
         anchor: Anchor.center,
       ),
     );
-
-    camera.followVector2(Vector2.zero());
   }
 }
diff --git a/packages/flame_mini_sprite/example/pubspec.lock b/packages/flame_mini_sprite/example/pubspec.lock
@@ -5,72 +5,81 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.9.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.18.0"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
   equatable:
     dependency: transitive
     description:
       name: equatable
-      url: "https://pub.dartlang.org"
+      sha256: c6094fd1efad3046334a9c40bee022147e55c25401ccd89b94e373e3edadd375
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.3"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   flame:
     dependency: "direct main"
     description:
       name: flame
-      url: "https://pub.dartlang.org"
+      sha256: "61c42b966a6b1f44ee093194e6701d45b14fdda1859c14fe68a39489454bfbd4"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.14.0"
   flame_mini_sprite:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.0.1+1"
+    version: "0.0.1+2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -80,7 +89,8 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.dartlang.org"
+      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
   flutter_test:
@@ -92,51 +102,57 @@ packages:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      sha256: "5cfd6509652ff5e7fe149b6df4859e687fca9048437857cb2e65c8d780f396e3"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.12"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.5"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.10.0"
   mini_sprite:
     dependency: "direct main"
     description:
       path: "../../mini_sprite"
       relative: true
     source: path
-    version: "0.0.2"
+    version: "0.1.0"
   ordered_set:
     dependency: transitive
     description:
       name: ordered_set
-      url: "https://pub.dartlang.org"
+      sha256: "3858c7d84619edfab87c3e367584648020903187edb70b52697646f4b2a93022"
+      url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "5.0.2"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -146,51 +162,66 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.12"
+    version: "0.6.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
 sdks:
-  dart: ">=2.17.6 <3.0.0"
-  flutter: ">=3.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
+  flutter: ">=3.13.0"
diff --git a/packages/flame_mini_sprite/example/pubspec.yaml b/packages/flame_mini_sprite/example/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
   sdk: ">=2.17.6 <3.0.0"
 
 dependencies:
-  flame: ^1.2.1
+  flame: ^1.14.0
   flame_mini_sprite:
     path: ../
   flutter: