Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/nashilli/river-version-0.13.4' i…
Browse files Browse the repository at this point in the history
…nto nashilli/river-version-0.13.4
  • Loading branch information
nashilli authored and nashilli committed May 24, 2024
2 parents 7387653 + 73c9cf2 commit 9d9ad03
Show file tree
Hide file tree
Showing 65 changed files with 67 additions and 74 deletions.
1 change: 0 additions & 1 deletion .github/.cspell/dart_dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ dartdoc # documentation tool for dart
dartdocs # plural of dartdoc
endtemplate # Use @endtemplate to close a @template block in dartdoc
pubspec # dependency and configuration file of every Dart project
typedefs # plural of typedef
writeln # StringBuffer.writeln
1 change: 0 additions & 1 deletion .github/.cspell/gamedev_dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ backquote # another word for backtick
Bezier # Bézier curves are parametric curves used in computer graphics
bimedian # line segment joining the midpoints of opposite sides of a shape
bitfield # data structure consisting of adjacent bits
blockquote # HTML tag
broadphase # common division of collision detection between broad and narrow phases
cathetus # the non-hypotenuse sides of a right triangle
clusterized # past tense of clusterize
Expand Down
4 changes: 0 additions & 4 deletions .github/.cspell/words_dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,15 @@ hoverables
inactives
microtask
orientable
overridable
platformer
positionable
postmultiply
preorder
prerender
prerendered
pressable
proxied
proxying
ptero # short for pterodactyl
rebalance
redeclaration
refreshable
renderable
rescan
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spell_checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: npm -g install cspell
- run: npm -g install cspell@8.8.2
# spell check
- run: ./scripts/cspell-run.sh
# verify dictionary words are sorted and not orphan
Expand Down
2 changes: 1 addition & 1 deletion doc/flame/examples/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 1.0.0
publish_to: none

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/klondike/app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 1.0.0
publish_to: none

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
flame: ^1.17.0
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/platformer/app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/space_shooter/app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: 'none'
version: 1.0.0+1

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
flame: ^1.17.0
Expand Down
2 changes: 1 addition & 1 deletion examples/games/padracing/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'
version: 1.0.0+1

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
collection: ^1.17.1
Expand Down
2 changes: 1 addition & 1 deletion examples/games/rogue_shooter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: 'none'
version: 0.1.0

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion examples/games/trex/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: 'none'
version: 0.1.0

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion examples/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: "none"
version: 0.1.0

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ command:

bootstrap:
environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"
dependencies:
meta: ^1.9.1
Expand Down
2 changes: 1 addition & 1 deletion packages/flame/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 0.1.0
publish_to: 'none'

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion packages/flame/lib/src/components/overlay_route.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class OverlayRoute extends Route {
@override
Component build() {
if (_builder != null) {
game.overlays.addEntry(name, _builder!);
game.overlays.addEntry(name, _builder);
}
return Component();
}
Expand Down
3 changes: 1 addition & 2 deletions packages/flame/lib/src/game/notifying_vector2.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'dart:typed_data';
import 'package:flutter/foundation.dart';
import 'package:vector_math/vector_math_64.dart';

Expand Down Expand Up @@ -186,5 +185,5 @@ class NotifyingVector2 extends Vector2 with ChangeNotifier {
}

@override
Float64List get storage => UnmodifiableFloat64ListView(super.storage);
Float64List get storage => super.storage.asUnmodifiableView();
}
2 changes: 1 addition & 1 deletion packages/flame/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_audio/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: 'none'
version: 1.0.0+1

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
flame: ^1.17.0
Expand Down
4 changes: 2 additions & 2 deletions packages/flame_audio/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
audioplayers: ^5.0.0
audioplayers: ^6.0.0
flame: ^1.17.0
flutter:
sdk: flutter
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_behavior_tree/behavior_tree/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
meta: ^1.9.1
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_behavior_tree/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
flame: ^1.17.0
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_behavior_tree/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_bloc/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: 'none'
version: 1.0.0+1

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_bloc/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
12 changes: 6 additions & 6 deletions packages/flame_devtools/lib/widgets/component_tree.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:animated_tree_view/animated_tree_view.dart';
import 'package:devtools_app_shared/ui.dart';
import 'package:devtools_app_shared/ui.dart' as devtools_ui;
import 'package:flame_devtools/widgets/component_tree_model.dart';
import 'package:flame_devtools/widgets/debug_mode_button.dart';
import 'package:flutter/material.dart';
Expand All @@ -10,7 +10,7 @@ class ComponentTree extends StatelessWidget {

@override
Widget build(BuildContext context) {
return Split(
return devtools_ui.Split(
axis: MediaQuery.of(context).size.width > 1000
? Axis.horizontal
: Axis.vertical,
Expand All @@ -35,10 +35,10 @@ class ComponentTreeSection extends ConsumerWidget {
final selectedTreeNode = ref.watch(selectedTreeNodeProvider);
final componentCount = loadedModel.componentCount;

return RoundedOutlinedBorder(
return devtools_ui.RoundedOutlinedBorder(
child: Column(
children: [
AreaPaneHeader(
devtools_ui.AreaPaneHeader(
title: Row(
children: [
Text(
Expand Down Expand Up @@ -113,11 +113,11 @@ class ComponentSection extends ConsumerWidget {
final theme = Theme.of(context);
final textStyle = theme.textTheme.bodyLarge;

return RoundedOutlinedBorder(
return devtools_ui.RoundedOutlinedBorder(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AreaPaneHeader(
devtools_ui.AreaPaneHeader(
title: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_devtools/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'
version: 0.1.0

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
animated_tree_view: ^2.2.0
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_fire_atlas/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: 'none'
version: 1.0.0+1

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
flame: ^1.17.0
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_fire_atlas/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_forge2d/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: 'none'
version: 1.0.0+1

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_forge2d/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_isolate/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: 'none'
version: 1.0.0+1

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_isolate/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 0.6.0+1
repository: https://github.com/flame-engine/flame/blob/main/packages/flame_isolate

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_jenny/jenny/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
meta: ^1.9.1
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_jenny/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_lint/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
lints: ^3.0.0
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_lottie/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ publish_to: 'none'
version: 0.0.1+1

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
flame: ^1.17.0
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_lottie/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_markdown/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'
version: 0.1.0

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"

dependencies:
flame: ^1.17.0
Expand Down
2 changes: 1 addition & 1 deletion packages/flame_markdown/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ funding:
- https://patreon.com/bluefireoss

environment:
sdk: ">=3.0.0 <4.0.0"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
Expand Down
Loading

0 comments on commit 9d9ad03

Please sign in to comment.