Skip to content

Commit de1e233

Browse files
dep updates (#2471)
Updating `colorist` ## Pre-launch Checklist - [x] I read the [Effective Dart: Style] _recently_, and have followed its advice. - [x] I signed the [CLA]. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-devrel channel on [Discord]. <!-- Links --> [Effective Dart: Style]: https://dart.dev/guides/language/effective-dart/style [CLA]: https://cla.developers.google.com/ [Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
1 parent 2b7c9c6 commit de1e233

110 files changed

Lines changed: 15544 additions & 565 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,3 @@
1111

1212
# IDEs
1313
.idea/
14-
15-
# Lockfiles
16-
package-lock.json
17-
Podfile.lock
18-
pubspec.lock
19-
yarn.lock

brick_breaker/codelab_rebuild.yaml

Lines changed: 46 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ steps:
7979
final game = FlameGame();
8080
runApp(GameWidget(game: game));
8181
}
82+
- name: Flutter clean
83+
path: brick_breaker
84+
flutter: clean --include-xcode-workspace
8285
- name: Build iOS simulator bundle
8386
platforms: [macos]
8487
path: brick_breaker
@@ -99,9 +102,6 @@ steps:
99102
copydir:
100103
from: brick_breaker
101104
to: step_03
102-
- name: Flutter clean
103-
path: step_03
104-
flutter: clean
105105
- name: step_04
106106
steps:
107107
- name: Remove generated code
@@ -153,11 +153,11 @@ steps:
153153
154154
@override
155155
FutureOr<void> onLoad() async {
156-
super.onLoad();
156+
await super.onLoad();
157157
158158
camera.viewfinder.anchor = Anchor.topLeft;
159159
160-
world.add(PlayArea());
160+
await world.add(PlayArea());
161161
}
162162
}
163163
- name: Add lib/src/config.dart
@@ -198,10 +198,13 @@ steps:
198198
199199
@override
200200
FutureOr<void> onLoad() async {
201-
super.onLoad();
201+
await super.onLoad();
202202
size = Vector2(game.width, game.height);
203203
}
204204
}
205+
- name: Flutter clean
206+
path: brick_breaker
207+
flutter: clean --include-xcode-workspace
205208
- name: Build iOS simulator bundle
206209
platforms: [macos]
207210
path: brick_breaker
@@ -222,9 +225,6 @@ steps:
222225
copydir:
223226
from: brick_breaker
224227
to: step_04
225-
- name: Flutter clean
226-
path: step_04
227-
flutter: clean
228228
- name: step_05
229229
steps:
230230
- name: Remove generated code
@@ -253,9 +253,9 @@ steps:
253253
@@ -29,5 +31,18 @@ class BrickBreaker extends FlameGame {
254254
camera.viewfinder.anchor = Anchor.topLeft;
255255
256-
world.add(PlayArea());
256+
await world.add(PlayArea());
257257
+
258-
+ world.add(
258+
+ await world.add(
259259
+ Ball(
260260
+ radius: ballRadius,
261261
+ position: size / 2,
@@ -321,6 +321,9 @@ steps:
321321
position += velocity * dt;
322322
}
323323
}
324+
- name: Flutter clean
325+
path: brick_breaker
326+
flutter: clean --include-xcode-workspace
324327
- name: Build iOS simulator bundle
325328
platforms: [macos]
326329
path: brick_breaker
@@ -341,9 +344,6 @@ steps:
341344
copydir:
342345
from: brick_breaker
343346
to: step_05
344-
- name: Flutter clean
345-
path: step_05
346-
flutter: clean
347347
- name: step_06
348348
steps:
349349
- name: Remove generated code
@@ -443,6 +443,9 @@ steps:
443443
444444
@override
445445
FutureOr<void> onLoad() async {
446+
- name: Flutter clean
447+
path: brick_breaker
448+
flutter: clean --include-xcode-workspace
446449
- name: Build iOS simulator bundle
447450
platforms: [macos]
448451
path: brick_breaker
@@ -463,9 +466,6 @@ steps:
463466
copydir:
464467
from: brick_breaker
465468
to: step_06
466-
- name: Flutter clean
467-
path: step_06
468-
flutter: clean
469469
- name: step_07
470470
steps:
471471
- name: Remove generated code
@@ -497,7 +497,7 @@ steps:
497497
),
498498
);
499499
500-
+ world.add(
500+
+ await world.add(
501501
+ Bat(
502502
+ size: Vector2(batWidth, batHeight),
503503
+ cornerRadius: const Radius.circular(ballRadius / 2),
@@ -631,6 +631,9 @@ steps:
631631
);
632632
}
633633
}
634+
- name: Flutter clean
635+
path: brick_breaker
636+
flutter: clean --include-xcode-workspace
634637
- name: Build iOS simulator bundle
635638
platforms: [macos]
636639
path: brick_breaker
@@ -651,9 +654,6 @@ steps:
651654
copydir:
652655
from: brick_breaker
653656
to: step_07
654-
- name: Flutter clean
655-
path: step_07
656-
flutter: clean
657657
- name: step_08
658658
steps:
659659
- name: Remove generated code
@@ -665,7 +665,7 @@ steps:
665665
+++ a/brick_breaker/step_08/lib/src/brick_breaker.dart
666666
@@ -38,6 +38,7 @@ class BrickBreaker extends FlameGame
667667
668-
world.add(
668+
await world.add(
669669
Ball(
670670
+ difficultyModifier: difficultyModifier,
671671
radius: ballRadius,
@@ -826,6 +826,9 @@ steps:
826826
}
827827
}
828828
}
829+
- name: Flutter clean
830+
path: brick_breaker
831+
flutter: clean --include-xcode-workspace
829832
- name: Build iOS simulator bundle
830833
platforms: [macos]
831834
path: brick_breaker
@@ -846,9 +849,6 @@ steps:
846849
copydir:
847850
from: brick_breaker
848851
to: step_08
849-
- name: Flutter clean
850-
path: step_08
851-
flutter: clean
852852
- name: step_09
853853
steps:
854854
- name: Remove generated code
@@ -912,11 +912,12 @@ steps:
912912
+
913913
@override
914914
FutureOr<void> onLoad() async {
915-
super.onLoad();
916-
@@ -36,6 +54,18 @@ class BrickBreaker extends FlameGame
915+
await super.onLoad();
916+
@@ -36,7 +54,19 @@ class BrickBreaker extends FlameGame
917917
918-
world.add(PlayArea());
918+
await world.add(PlayArea());
919919
920+
- await world.add(
920921
+ playState = PlayState.welcome;
921922
+ }
922923
+
@@ -929,9 +930,19 @@ steps:
929930
+
930931
+ playState = PlayState.playing;
931932
+
932-
world.add(
933+
+ world.add(
933934
Ball(
934935
difficultyModifier: difficultyModifier,
936+
radius: ballRadius,
937+
@@ -48,7 +78,7 @@ class BrickBreaker extends FlameGame
938+
),
939+
);
940+
941+
- await world.add(
942+
+ world.add(
943+
Bat(
944+
size: Vector2(batWidth, batHeight),
945+
cornerRadius: const Radius.circular(ballRadius / 2),
935946
@@ -56,7 +86,7 @@ class BrickBreaker extends FlameGame
936947
),
937948
);
@@ -1119,6 +1130,9 @@ steps:
11191130
<application
11201131
android:label="brick_breaker"
11211132
android:name="${applicationName}"
1133+
- name: Flutter clean
1134+
path: brick_breaker
1135+
flutter: clean --include-xcode-workspace
11221136
- name: Build iOS simulator bundle
11231137
platforms: [macos]
11241138
path: brick_breaker
@@ -1139,9 +1153,6 @@ steps:
11391153
copydir:
11401154
from: brick_breaker
11411155
to: step_09
1142-
- name: Flutter clean
1143-
path: step_09
1144-
flutter: clean
11451156
- name: step_10
11461157
steps:
11471158
- name: Remove generated code
@@ -1344,6 +1355,9 @@ steps:
13441355
);
13451356
}
13461357
}
1358+
- name: Flutter clean
1359+
path: brick_breaker
1360+
flutter: clean --include-xcode-workspace
13471361
- name: Build iOS simulator bundle
13481362
platforms: [macos]
13491363
path: brick_breaker
@@ -1364,8 +1378,5 @@ steps:
13641378
copydir:
13651379
from: brick_breaker
13661380
to: step_10
1367-
- name: Flutter clean
1368-
path: step_10
1369-
flutter: clean
13701381
- name: Cleanup
13711382
rmdir: brick_breaker

0 commit comments

Comments
 (0)