Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorg cleanup #8

Merged
merged 6 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
cargo: fix workspace toml
  • Loading branch information
philiplinden committed Dec 17, 2024
commit 5d4a55326b4107833fdfcd38b6df8a1dfe412269
70 changes: 10 additions & 60 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,48 +1,3 @@
[package]
name = "yahs"
description = "Yet Another HAB Simulator"
version = "0.4.0"
authors = ["Philip Linden <lindenphilipj@gmail.com>"]
readme = "README.md"
license = "MIT or Apache-2.0"
edition = "2021"

default-run = "yahs"

# When importing this crate as a dependency, use the simulator library as "yahs"
[lib]
name = "yahs"
path = "crates/yahs/src/lib.rs"

# When running this project as a CLI, use the CLI binary as "yahs"
[[bin]]
name = "yahs"
path = "crates/yahs-cli/src/main.rs"

# These are the dependencies when building the CLI from the project root
[dependencies]
# Simulator dependencies
yahs = { path = "crates/yahs" }
bevy = { workspace = true }
avian3d = { workspace = true }
bevy-trait-query = { workspace = true }

# CLI dependencies
yahs-cli = { path = "crates/yahs-cli" }
bevy_ratatui = "0.7.0"
ratatui = "0.29"
color-eyre = "0.6.3"
crossterm = "0.28.1"

[features]
default = ["dev"]
dev = ["yahs-cli/dev", "yahs/dev"]

[workspace.package]
authors = ["Philip Linden <lindenphilipj@gmail.com>"]
edition = "2021"
license = "MIT or Apache-2.0"

[workspace]
resolver = "2" # Important for Bevy
members = [
Expand All @@ -51,6 +6,16 @@ members = [
"crates/yahs-ui"
]

[workspace.package]
name = "yahs"
description = "Yet Another HAB Simulator"
version = "0.4.0"
authors = ["Philip Linden <lindenphilipj@gmail.com>"]
readme = "README.md"
edition = "2021"
license = "MIT or Apache-2.0"
license-file = "LICENSE-APACHE"

[workspace.dependencies]
# Shared dependencies with fixed versions
bevy = { version = "0.15.0", default-features = false, features = [
Expand All @@ -59,21 +24,6 @@ bevy = { version = "0.15.0", default-features = false, features = [
avian3d = { git = "https://github.com/Jondolf/avian.git", branch = "main" }
bevy-trait-query = "0.7.0"

# -----------------------------------------------------------------------------
# Some Bevy optimizations
# -----------------------------------------------------------------------------

# Idiomatic Bevy code often triggers these lints, and the CI workflow treats
# them as errors. In some cases they may still signal poor code quality however,
# so consider commenting out these lines.
[lints.clippy]
# Bevy supplies arguments to systems via dependency injection, so it's
# natural for systems to request more than 7 arguments -- which triggers
# this lint.
too_many_arguments = "allow"
# Queries that access many components may trigger this lint.
type_complexity = "allow"

# Compile with Performance Optimizations:
# https://bevyengine.org/learn/quick-start/getting-started/setup/#compile-with-performance-optimizations

Expand Down
2 changes: 1 addition & 1 deletion crates/yahs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "yahs-simulator"
name = "yahs"
version = "0.4.0"
description = "High Altitude Balloon simulation plugin for Bevy"
edition = "2021"
Expand Down
Loading