Skip to content

Commit 1cca70e

Browse files
authored
chore: Correctly name packages (#3721)
* The root package should be named `_` in pub workspaces that doesn't have an actual app or package in the root. * Melos needs to be updated to support this. * The flame_3d example should be named flame_3d_example to follow the convention.
1 parent 1f997e0 commit 1cca70e

16 files changed

Lines changed: 43 additions & 43 deletions

.github/workflows/cicd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ jobs:
6262
- uses: subosito/flutter-action@v2
6363
- uses: bluefireteam/melos-action@v3
6464
- name: Install DCM
65-
uses: CQLabs/setup-dcm@v1
65+
uses: CQLabs/setup-dcm@v2
6666
with:
67-
github_token: ${{ secrets.GITHUB_TOKEN }}
67+
github-token: ${{ secrets.GITHUB_TOKEN }}
6868

6969
- name: Run DCM
7070
run: dcm analyze .

packages/flame_3d/example/lib/commands/commands.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:example/commands/destroy_command.dart';
2-
import 'package:example/commands/reset_command.dart';
3-
import 'package:example/commands/setup_command.dart';
1+
import 'package:flame_3d_example/commands/destroy_command.dart';
2+
import 'package:flame_3d_example/commands/reset_command.dart';
3+
import 'package:flame_3d_example/commands/setup_command.dart';
44

55
const customCommandProviders = [
66
ResetCommand.new,

packages/flame_3d/example/lib/commands/destroy_command.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import 'package:example/components/crate.dart';
2-
import 'package:example/components/player.dart';
3-
import 'package:example/components/rendered_point_light.dart';
4-
import 'package:example/components/room_bounds.dart';
5-
import 'package:example/example_game_3d.dart';
61
import 'package:flame/components.dart';
72
import 'package:flame_3d/camera.dart';
83
import 'package:flame_3d/components.dart';
4+
import 'package:flame_3d_example/components/crate.dart';
5+
import 'package:flame_3d_example/components/player.dart';
6+
import 'package:flame_3d_example/components/rendered_point_light.dart';
7+
import 'package:flame_3d_example/components/room_bounds.dart';
8+
import 'package:flame_3d_example/example_game_3d.dart';
99
import 'package:flame_console/flame_console.dart';
1010

1111
class DestroyCommand extends FlameConsoleCommand<ExampleGame3D> {

packages/flame_3d/example/lib/commands/reset_command.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:example/example_game_3d.dart';
1+
import 'package:flame_3d_example/example_game_3d.dart';
22
import 'package:flame_console/flame_console.dart';
33

44
class ResetCommand extends FlameConsoleCommand<ExampleGame3D> {

packages/flame_3d/example/lib/commands/setup_command.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:example/commands/destroy_command.dart';
2-
import 'package:example/example_game_3d.dart';
3-
import 'package:example/scenarios/game_scenario.dart';
1+
import 'package:flame_3d_example/commands/destroy_command.dart';
2+
import 'package:flame_3d_example/example_game_3d.dart';
3+
import 'package:flame_3d_example/scenarios/game_scenario.dart';
44
import 'package:flame_console/flame_console.dart';
55

66
class SetupCommand extends FlameConsoleCommand<ExampleGame3D> {

packages/flame_3d/example/lib/components/player.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import 'dart:math';
22

3-
import 'package:example/example_game_3d.dart';
4-
import 'package:example/keyboard_utils.dart';
53
import 'package:flame/components.dart' show HasGameReference, KeyboardHandler;
64
import 'package:flame/geometry.dart';
75
import 'package:flame/input.dart';
86
import 'package:flame/palette.dart';
97
import 'package:flame_3d/components.dart';
108
import 'package:flame_3d/game.dart';
119
import 'package:flame_3d/resources.dart';
10+
import 'package:flame_3d_example/example_game_3d.dart';
11+
import 'package:flame_3d_example/keyboard_utils.dart';
1212
import 'package:flutter/services.dart';
1313

1414
class Player extends MeshComponent

packages/flame_3d/example/lib/components/simple_hud.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import 'dart:ui';
22

3-
import 'package:example/example_game_3d.dart';
43
import 'package:flame/components.dart';
54
import 'package:flame/text.dart';
65
import 'package:flame_3d/camera.dart';
6+
import 'package:flame_3d_example/example_game_3d.dart';
77

88
const _width = 1.2;
99
const _color = Color(0xFFFFFFFF);

packages/flame_3d/example/lib/example_camera_3d.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import 'package:example/components/player.dart';
2-
import 'package:example/components/simple_hud.dart';
3-
import 'package:example/example_game_3d.dart';
41
import 'package:flame/components.dart';
52
import 'package:flame/extensions.dart' as v64 show Vector2;
63
import 'package:flame_3d/camera.dart';
4+
import 'package:flame_3d_example/components/player.dart';
5+
import 'package:flame_3d_example/components/simple_hud.dart';
6+
import 'package:flame_3d_example/example_game_3d.dart';
77

88
class ExampleCamera3D extends CameraComponent3D
99
with HasGameReference<ExampleGame3D> {

packages/flame_3d/example/lib/example_game_3d.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import 'dart:async';
22

3-
import 'package:example/components/player.dart';
4-
import 'package:example/components/room_bounds.dart';
5-
import 'package:example/example_camera_3d.dart';
6-
import 'package:example/scenarios/game_scenario.dart';
73
import 'package:flame/events.dart';
84
import 'package:flame_3d/camera.dart';
95
import 'package:flame_3d/components.dart';
106
import 'package:flame_3d/game.dart';
7+
import 'package:flame_3d_example/components/player.dart';
8+
import 'package:flame_3d_example/components/room_bounds.dart';
9+
import 'package:flame_3d_example/example_camera_3d.dart';
10+
import 'package:flame_3d_example/scenarios/game_scenario.dart';
1111
import 'package:flutter/services.dart';
1212
import 'package:flutter/widgets.dart';
1313

packages/flame_3d/example/lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:example/commands/commands.dart';
2-
import 'package:example/example_game_3d.dart';
31
import 'package:flame/game.dart';
2+
import 'package:flame_3d_example/commands/commands.dart';
3+
import 'package:flame_3d_example/example_game_3d.dart';
44
import 'package:flame_console/flame_console.dart';
55
import 'package:flutter/widgets.dart';
66

0 commit comments

Comments
 (0)