Skip to content

Commit fe412a8

Browse files
CodeDoctorDECodeDoctorDE
committed
Upgrade breaking changes of flame and update dependencies
1 parent aec672a commit fe412a8

File tree

14 files changed

+850
-870
lines changed

14 files changed

+850
-870
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ jobs:
966966
- name: Setup Fastlane
967967
uses: ruby/setup-ruby@v1
968968
with:
969-
ruby-version: "3.4.6"
969+
ruby-version: "3.4.7"
970970
bundler-cache: true
971971
working-directory: app/android
972972
- name: 🚀 Deploy to Play Store

‎api/pubspec.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,18 @@ packages:
7777
dependency: transitive
7878
description:
7979
name: build_daemon
80-
sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
80+
sha256: "409002f1adeea601018715d613115cfaf0e31f512cb80ae4534c79867ae2363d"
8181
url: "https://pub.dev"
8282
source: hosted
83-
version: "4.0.4"
83+
version: "4.1.0"
8484
build_runner:
8585
dependency: "direct dev"
8686
description:
8787
name: build_runner
88-
sha256: "4e54dbeefdc70691ba80b3bce3976af63b5425c8c07dface348dfee664a0edc1"
88+
sha256: a9461b8e586bf018dd4afd2e13b49b08c6a844a4b226c8d1d10f3a723cdd78c3
8989
url: "https://pub.dev"
9090
source: hosted
91-
version: "2.9.0"
91+
version: "2.10.1"
9292
built_collection:
9393
dependency: transitive
9494
description:

‎app/android/Gemfile.lock‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ GEM
1111
artifactory (3.0.17)
1212
atomos (0.1.3)
1313
aws-eventstream (1.4.0)
14-
aws-partitions (1.1173.0)
15-
aws-sdk-core (3.233.0)
14+
aws-partitions (1.1177.0)
15+
aws-sdk-core (3.235.0)
1616
aws-eventstream (~> 1, >= 1.3.0)
1717
aws-partitions (~> 1, >= 1.992.0)
1818
aws-sigv4 (~> 1.9)
1919
base64
2020
bigdecimal
2121
jmespath (~> 1, >= 1.6.1)
2222
logger
23-
aws-sdk-kms (1.113.0)
24-
aws-sdk-core (~> 3, >= 3.231.0)
23+
aws-sdk-kms (1.115.0)
24+
aws-sdk-core (~> 3, >= 3.234.0)
2525
aws-sigv4 (~> 1.5)
26-
aws-sdk-s3 (1.200.0)
27-
aws-sdk-core (~> 3, >= 3.231.0)
26+
aws-sdk-s3 (1.201.0)
27+
aws-sdk-core (~> 3, >= 3.234.0)
2828
aws-sdk-kms (~> 1)
2929
aws-sigv4 (~> 1.5)
3030
aws-sigv4 (1.12.1)
@@ -160,7 +160,7 @@ GEM
160160
httpclient (2.9.0)
161161
mutex_m
162162
jmespath (1.6.2)
163-
json (2.15.1)
163+
json (2.15.2)
164164
jwt (2.10.2)
165165
base64
166166
logger (1.7.0)

‎app/lib/board/game.dart‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,11 @@ import 'package:setonix/bloc/world/state.dart';
1313
import 'package:setonix/board/grid.dart';
1414
import 'package:setonix/board/hand/view.dart';
1515
import 'package:setonix/helpers/scroll.dart';
16-
import 'package:setonix/helpers/secondary.dart';
1716
import 'package:setonix/helpers/vector.dart';
1817
import 'package:setonix_api/setonix_api.dart';
1918

2019
class BoardGame extends FlameGame
21-
with
22-
ScrollDetector,
23-
KeyboardEvents,
24-
SecondaryTapDetector,
25-
HasCollisionDetection {
20+
with ScrollDetector, KeyboardEvents, HasCollisionDetection {
2621
final VoidCallback onEscape;
2722
final ContextMenuController contextMenuController;
2823
late final Sprite selectionSprite, blankSprite;
@@ -86,13 +81,6 @@ class BoardGame extends FlameGame
8681
).whereType<ScrollCallbacks>().any((element) => element.onScroll(info));
8782
}
8883

89-
@override
90-
void onSecondaryTapUp(TapUpInfo info) {
91-
componentsAtPoint(info.eventPosition.widget)
92-
.whereType<SecondaryTapCallbacks>()
93-
.any((element) => element.onSecondaryTapUp(info));
94-
}
95-
9684
Vector2 _currentCameraVelocity = Vector2.zero();
9785

9886
@override

‎app/lib/helpers/secondary.dart‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@ import 'package:flame/game.dart';
33
import 'package:flutter/foundation.dart';
44
import 'package:flutter/gestures.dart';
55

6-
mixin SecondaryTapCallbacks {
7-
bool onSecondaryTapUp(TapUpInfo info) => false;
8-
}
9-
106
mixin DetailsTapCallbacks on SecondaryTapCallbacks, DoubleTapCallbacks {
117
Vector2? _position;
128

139
@override
1410
@mustCallSuper
15-
bool onSecondaryTapUp(TapUpInfo info) {
16-
onContextMenu(info.eventPosition.global);
17-
return true;
11+
void onSecondaryTapUp(SecondaryTapUpEvent event) {
12+
onContextMenu(event.devicePosition);
1813
}
1914

2015
@override

‎app/pubspec.lock‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,18 @@ packages:
109109
dependency: transitive
110110
description:
111111
name: build_daemon
112-
sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
112+
sha256: "409002f1adeea601018715d613115cfaf0e31f512cb80ae4534c79867ae2363d"
113113
url: "https://pub.dev"
114114
source: hosted
115-
version: "4.0.4"
115+
version: "4.1.0"
116116
build_runner:
117117
dependency: "direct dev"
118118
description:
119119
name: build_runner
120-
sha256: "4e54dbeefdc70691ba80b3bce3976af63b5425c8c07dface348dfee664a0edc1"
120+
sha256: a9461b8e586bf018dd4afd2e13b49b08c6a844a4b226c8d1d10f3a723cdd78c3
121121
url: "https://pub.dev"
122122
source: hosted
123-
version: "2.9.0"
123+
version: "2.10.1"
124124
built_collection:
125125
dependency: transitive
126126
description:
@@ -278,10 +278,10 @@ packages:
278278
dependency: "direct main"
279279
description:
280280
name: device_info_plus
281-
sha256: "49413c8ca514dea7633e8def233b25efdf83ec8522955cc2c0e3ad802927e7c6"
281+
sha256: dd0e8e02186b2196c7848c9d394a5fd6e5b57a43a546082c5820b1ec72317e33
282282
url: "https://pub.dev"
283283
source: hosted
284-
version: "12.1.0"
284+
version: "12.2.0"
285285
device_info_plus_platform_interface:
286286
dependency: transitive
287287
description:
@@ -342,10 +342,10 @@ packages:
342342
dependency: transitive
343343
description:
344344
name: file_selector_ios
345-
sha256: fe9f52123af16bba4ad65bd7e03defbbb4b172a38a8e6aaa2a869a0c56a5f5fb
345+
sha256: fc3c3fc567cd9bcae784dfeb98d37c46a8ded9e8757d37ea67e975c399bc14e0
346346
url: "https://pub.dev"
347347
source: hosted
348-
version: "0.5.3+2"
348+
version: "0.5.3+3"
349349
file_selector_linux:
350350
dependency: transitive
351351
description:
@@ -358,10 +358,10 @@ packages:
358358
dependency: transitive
359359
description:
360360
name: file_selector_macos
361-
sha256: "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c"
361+
sha256: "88707a3bec4b988aaed3b4df5d7441ee4e987f20b286cddca5d6a8270cab23f2"
362362
url: "https://pub.dev"
363363
source: hosted
364-
version: "0.9.4+4"
364+
version: "0.9.4+5"
365365
file_selector_platform_interface:
366366
dependency: transitive
367367
description:
@@ -398,34 +398,34 @@ packages:
398398
dependency: "direct main"
399399
description:
400400
name: flame
401-
sha256: "86f63943349ef4d891fd1988ccd9fa3d27952eb8d9eb17b774a64e78cd62aaa6"
401+
sha256: "3725f1ab4ca07f77955c2b1c21d02906646ec0be95f7bc141854a529704fda9d"
402402
url: "https://pub.dev"
403403
source: hosted
404-
version: "1.32.0"
404+
version: "1.33.0"
405405
flame_bloc:
406406
dependency: "direct main"
407407
description:
408408
name: flame_bloc
409-
sha256: b73f5f931ea3209c7d387660ffd543b0bb4b4c1ad84a22516b1d900d487eedde
409+
sha256: "6a55612762c9a9e771aa3744db0f8bd61cfadf9a5a8e68cb755aff567cfebaa4"
410410
url: "https://pub.dev"
411411
source: hosted
412-
version: "1.12.17"
412+
version: "1.12.18"
413413
flame_tiled:
414414
dependency: "direct main"
415415
description:
416416
name: flame_tiled
417-
sha256: "36fef1d6b3caaa8b26f18cd20d1038d8d3409b8a9ea12de2c1295266c0d8e3c9"
417+
sha256: d30c3f7f6e13e71dd6c1de56c6c644af29717518e464ab41ef76cd1a03f151c0
418418
url: "https://pub.dev"
419419
source: hosted
420-
version: "3.0.7"
420+
version: "3.0.8"
421421
flex_color_scheme:
422422
dependency: "direct main"
423423
description:
424424
name: flex_color_scheme
425-
sha256: "034d5720747e6af39b2ad090d82dd92d33fde68e7964f1814b714c9d49ddbd64"
425+
sha256: "6e713c27a2ebe63393a44d4bf9cdd2ac81e112724a4c69905fc41cbf231af11d"
426426
url: "https://pub.dev"
427427
source: hosted
428-
version: "8.3.0"
428+
version: "8.3.1"
429429
flex_seed_scheme:
430430
dependency: transitive
431431
description:
@@ -580,10 +580,10 @@ packages:
580580
dependency: "direct main"
581581
description:
582582
name: go_router
583-
sha256: e1d7ffb0db475e6e845eb58b44768f50b830e23960e3df6908924acd8f7f70ea
583+
sha256: d8f590a69729f719177ea68eb1e598295e8dbc41bbc247fed78b2c8a25660d7c
584584
url: "https://pub.dev"
585585
source: hosted
586-
version: "16.2.5"
586+
version: "16.3.0"
587587
graphs:
588588
dependency: transitive
589589
description:
@@ -937,10 +937,10 @@ packages:
937937
dependency: transitive
938938
description:
939939
name: path_provider_foundation
940-
sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
940+
sha256: efaec349ddfc181528345c56f8eda9d6cccd71c177511b132c6a0ddaefaa2738
941941
url: "https://pub.dev"
942942
source: hosted
943-
version: "2.4.2"
943+
version: "2.4.3"
944944
path_provider_linux:
945945
dependency: transitive
946946
description:
@@ -1135,10 +1135,10 @@ packages:
11351135
dependency: transitive
11361136
description:
11371137
name: share_plus
1138-
sha256: "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6"
1138+
sha256: "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840"
11391139
url: "https://pub.dev"
11401140
source: hosted
1141-
version: "12.0.0"
1141+
version: "12.0.1"
11421142
share_plus_platform_interface:
11431143
dependency: transitive
11441144
description:
@@ -1167,10 +1167,10 @@ packages:
11671167
dependency: transitive
11681168
description:
11691169
name: shared_preferences_foundation
1170-
sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
1170+
sha256: "1c33a907142607c40a7542768ec9badfd16293bac51da3a4482623d15845f88b"
11711171
url: "https://pub.dev"
11721172
source: hosted
1173-
version: "2.5.4"
1173+
version: "2.5.5"
11741174
shared_preferences_linux:
11751175
dependency: transitive
11761176
description:
@@ -1365,10 +1365,10 @@ packages:
13651365
dependency: transitive
13661366
description:
13671367
name: url_launcher_ios
1368-
sha256: d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7
1368+
sha256: "6b63f1441e4f653ae799166a72b50b1767321ecc263a57aadf825a7a2a5477d9"
13691369
url: "https://pub.dev"
13701370
source: hosted
1371-
version: "6.3.4"
1371+
version: "6.3.5"
13721372
url_launcher_linux:
13731373
dependency: transitive
13741374
description:
@@ -1381,10 +1381,10 @@ packages:
13811381
dependency: transitive
13821382
description:
13831383
name: url_launcher_macos
1384-
sha256: c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f
1384+
sha256: "8262208506252a3ed4ff5c0dc1e973d2c0e0ef337d0a074d35634da5d44397c9"
13851385
url: "https://pub.dev"
13861386
source: hosted
1387-
version: "3.2.3"
1387+
version: "3.2.4"
13881388
url_launcher_platform_interface:
13891389
dependency: transitive
13901390
description:
@@ -1555,4 +1555,4 @@ packages:
15551555
version: "3.1.3"
15561556
sdks:
15571557
dart: ">=3.9.0 <4.0.0"
1558-
flutter: ">=3.35.5"
1558+
flutter: ">=3.35.7"

‎app/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ publish_to: none
1616

1717
environment:
1818
sdk: ">=3.8.0 <4.0.0"
19-
flutter: 3.35.5
19+
flutter: 3.35.7
2020

2121
dependencies:
2222
flutter:
@@ -47,7 +47,7 @@ dependencies:
4747
rxdart: ^0.28.0
4848
collection: ^1.18.0
4949
flame_bloc: ^1.12.14
50-
flame: ">=1.32.0 <1.33.0"
50+
flame: ">=1.33.0 <1.34.0"
5151
flame_tiled: ^3.0.4
5252
# Networking
5353
http: ^1.2.1

‎docs/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/check": "^0.9.4",
13+
"@astrojs/check": "^0.9.5",
1414
"@astrojs/react": "^4.4.0",
1515
"@astrojs/starlight": "^0.36.1",
1616
"@phosphor-icons/react": "^2.1.10",
1717
"@types/react": "^19.2.2",
1818
"@types/react-dom": "^19.2.2",
19-
"astro": "^5.14.5",
19+
"astro": "^5.15.1",
2020
"react": "^19.2.0",
2121
"react-dom": "^19.2.0",
2222
"remark-gemoji": "^8.0.0",
2323
"remark-heading-id": "^1.0.1",
2424
"typescript": "^5.9.3"
2525
},
26-
"packageManager": "pnpm@10.18.3",
26+
"packageManager": "pnpm@10.19.0",
2727
"devDependencies": {
2828
"@vite-pwa/astro": "^1.1.1",
2929
"sass": "^1.93.2",

0 commit comments

Comments
 (0)