From 5d4a55326b4107833fdfcd38b6df8a1dfe412269 Mon Sep 17 00:00:00 2001
From: Philip Linden <lindenphilipj@gmail.com>
Date: Tue, 17 Dec 2024 02:06:51 -0500
Subject: [PATCH] cargo: fix workspace toml

---
 Cargo.toml             | 70 ++++++------------------------------------
 crates/yahs/Cargo.toml |  2 +-
 2 files changed, 11 insertions(+), 61 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3440737..bdf7399 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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 = [
@@ -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 = [
@@ -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
 
diff --git a/crates/yahs/Cargo.toml b/crates/yahs/Cargo.toml
index 261c979..b333bfe 100644
--- a/crates/yahs/Cargo.toml
+++ b/crates/yahs/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "yahs-simulator"
+name = "yahs"
 version = "0.4.0"
 description = "High Altitude Balloon simulation plugin for Bevy"
 edition = "2021"