includes changes from machete and hakari

.config/hakari.toml

@@ -0,0 +1,25 @@
+# This file contains settings for `cargo hakari`.
+# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options.
+
+hakari-package = "workspace-hakari"
+
+# Format version for hakari's output. Version 4 requires cargo-hakari 0.9.22 or above.
+dep-format-version = "4"
+
+# Setting workspace.resolver = "2" in the root Cargo.toml is HIGHLY recommended.
+# Hakari works much better with the new feature resolver.
+# For more about the new feature resolver, see:
+# https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver
+resolver = "2"
+
+# Add triples corresponding to platforms commonly used by developers here.
+# https://doc.rust-lang.org/rustc/platform-support.html
+platforms = [
+    # "x86_64-unknown-linux-gnu",
+    # "x86_64-apple-darwin",
+    # "aarch64-apple-darwin",
+    # "x86_64-pc-windows-msvc",
+]
+
+# Write out exact versions rather than a semver range. (Defaults to false.)
+# exact-versions = true

Cargo.toml

@@ -18,7 +18,8 @@ members = [
     "game",
     "crates/*",
     "modules/bevy_xpbd_plugin", 
-    "external/editor_as_plugin"
+    "external/editor_as_plugin", 
+    "workspace-hakari"
 ]
 
 resolver = "2"
@@ -92,6 +93,7 @@ game_app.workspace = true
 
 # Modules for external crates
 space_bevy_xpbd_plugin = { workspace = true, optional = true }
+workspace-hakari = { version = "0.1", path = "workspace-hakari" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 backtrace-on-stack-overflow = {version = "0.3", optional = true}

crates/editor_core/Cargo.toml

@@ -23,11 +23,12 @@ egui_dock.workspace = true
 egui-toast.workspace = true
 
 bevy_mod_outline = {version = "0.7.0", optional = true}
+workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
 [features]
 default = ["persistence_editor", "bevy_mod_outline"]
 persistence_editor = []
 bevy_mod_outline = ["dep:bevy_mod_outline"]
 
 [lints]
-workspace = true
+workspace = true

crates/editor_tabs/Cargo.toml

@@ -15,7 +15,7 @@ bevy_egui.workspace = true
 egui_extras.workspace = true
 convert_case.workspace = true
 egui_dock.workspace = true
-bevy-inspector-egui.workspace = true
+workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
 [lints]
 workspace = true

crates/editor_ui/Cargo.toml

@@ -34,9 +34,8 @@ bevy_mod_picking.workspace = true
 bevy_asset_loader.workspace = true
 bevy_panorbit_camera.workspace = true
 bevy_mod_billboard.workspace = true
-convert_case.workspace = true
 anyhow.workspace = true
-egui_extras.workspace = true
+workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
 [lints]
-workspace = true
+workspace = true

crates/persistence/Cargo.toml

@@ -14,6 +14,7 @@ homepage.workspace = true
 bevy.workspace = true
 ron.workspace = true 
 serde.workspace = true
+workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
 [lints]
-workspace = true
+workspace = true

crates/prefab/Cargo.toml

@@ -24,6 +24,7 @@ bevy-inspector-egui.workspace = true
 
 serde = { workspace = true }
 ron.workspace = true
+workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
 [dev-dependencies]
 rand = { workspace = true }

crates/shared/Cargo.toml

@@ -19,6 +19,7 @@ bevy-inspector-egui.workspace = true
 egui_file.workspace = true
 egui-toast.workspace = true
 image.workspace = true
+workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
 [lints]
-workspace = true
+workspace = true

crates/undo/Cargo.toml

@@ -13,6 +13,7 @@ homepage.workspace = true
 [dependencies]
 bevy.workspace = true
 pretty-type-name.workspace = true
+workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
 [lints]
-workspace = true
+workspace = true

external/editor_as_plugin/Cargo.toml

@@ -14,6 +14,7 @@ homepage.workspace = true
 [dependencies]
 bevy = "0.13.2"
 space_editor = { path = "../../"}
+workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
 [lints]
 workspace = true

game/Cargo.toml

@@ -16,4 +16,5 @@ required-features = ["bevy_xpbd_3d"]
 [dependencies]
 bevy.workspace = true
 space_prefab.workspace = true
-space_bevy_xpbd_plugin.workspace = true
+space_bevy_xpbd_plugin.workspace = true
+workspace-hakari = { version = "0.1", path = "../workspace-hakari" }

modules/bevy_xpbd_plugin/Cargo.toml

@@ -13,6 +13,7 @@ bevy.workspace = true
 space_editor_ui.workspace = true
 bevy_xpbd_3d = { workspace = true, features = ["3d", "f32", "collider-from-mesh", "debug-plugin", "default-collider", "parry-f32"] }
 bevy-inspector-egui.workspace = true 
+workspace-hakari = { version = "0.1", path = "../../workspace-hakari" }
 
 [lints]
 workspace = true

workspace-hakari/.gitattributes

@@ -0,0 +1,4 @@
+# Avoid putting conflict markers in the generated Cargo.toml file, since their presence breaks
+# Cargo.
+# Also do not check out the file as CRLF on Windows, as that's what hakari needs.
+Cargo.toml merge=binary -crlf

workspace-hakari/Cargo.toml

@@ -0,0 +1,49 @@
+# This file is generated by `cargo hakari`.
+# To regenerate, run:
+#     cargo hakari generate
+
+[package]
+name = "workspace-hakari"
+version = "0.1.0"
+description = "workspace-hack package, managed by hakari"
+# You can choose to publish this crate: see https://docs.rs/cargo-hakari/latest/cargo_hakari/publishing.
+publish = false
+
+# The parts of the file between the BEGIN HAKARI SECTION and END HAKARI SECTION comments
+# are managed by hakari.
+
+### BEGIN HAKARI SECTION
+[dependencies]
+ahash = { version = "0.8", features = ["no-rng", "serde"] }
+bevy = { version = "0.13", features = ["wayland"] }
+bevy_internal = { version = "0.13", default-features = false, features = ["android_shared_stdcxx", "animation", "bevy_asset", "bevy_debug_stepping", "bevy_gilrs", "bevy_gizmos", "bevy_gltf", "bevy_pbr", "bevy_scene", "bevy_sprite", "bevy_text", "bevy_ui", "default_font", "hdr", "ktx2", "multi-threaded", "png", "tonemapping_luts", "vorbis", "wayland", "webgl", "x11", "zstd"] }
+bevy_winit = { version = "0.13", default-features = false, features = ["wayland", "x11"] }
+bytemuck = { version = "1", default-features = false, features = ["aarch64_simd", "derive", "extern_crate_alloc"] }
+crossbeam-utils = { version = "0.8" }
+ecolor = { version = "0.26", default-features = false, features = ["bytemuck", "serde"] }
+egui = { version = "0.26", features = ["bytemuck", "serde"] }
+either = { version = "1", default-features = false, features = ["use_std"] }
+emath = { version = "0.26", default-features = false, features = ["bytemuck", "serde"] }
+epaint = { version = "0.26", default-features = false, features = ["bytemuck", "default_fonts", "serde"] }
+getrandom = { version = "0.2", default-features = false, features = ["std"] }
+glam = { version = "0.25", features = ["bytemuck", "mint", "serde"] }
+hashbrown = { version = "0.14", features = ["raw", "serde"] }
+image = { version = "0.24" }
+log = { version = "0.4", default-features = false, features = ["std"] }
+num-traits = { version = "0.2", features = ["i128", "libm"] }
+serde = { version = "1", features = ["alloc", "derive", "rc"] }
+uuid = { version = "1", features = ["serde", "v4"] }
+winit = { version = "0.29", default-features = false, features = ["rwh_06", "wayland", "wayland-csd-adwaita", "x11"] }
+
+[build-dependencies]
+ahash = { version = "0.8", features = ["no-rng", "serde"] }
+derive_more = { version = "0.99" }
+getrandom = { version = "0.2", default-features = false, features = ["std"] }
+hashbrown = { version = "0.14", features = ["raw", "serde"] }
+log = { version = "0.4", default-features = false, features = ["std"] }
+serde = { version = "1", features = ["alloc", "derive", "rc"] }
+syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full"] }
+syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["full", "visit"] }
+uuid = { version = "1", features = ["serde", "v4"] }
+
+### END HAKARI SECTION

workspace-hakari/build.rs

@@ -0,0 +1,2 @@
+// A build script is required for cargo to consider build dependencies.
+fn main() {}

workspace-hakari/src/lib.rs

@@ -0,0 +1 @@
+// This is a stub lib.rs.