From 9a40ca0ae44647a01d6a23a777a6c68f3093ce7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Feb 2026 20:17:34 +0000 Subject: [PATCH 1/3] Bump bytes from 1.11.0 to 1.11.1 in the cargo group across 1 directory Bumps the cargo group with 1 update in the / directory: [bytes](https://github.com/tokio-rs/bytes). Updates `bytes` from 1.11.0 to 1.11.1 - [Release notes](https://github.com/tokio-rs/bytes/releases) - [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/bytes/compare/v1.11.0...v1.11.1) --- updated-dependencies: - dependency-name: bytes dependency-version: 1.11.1 dependency-type: direct:production dependency-group: cargo ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- crates/macros/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 975e336..8fa903f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1902,9 +1902,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" dependencies = [ "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 39bf6a8..d35042d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ rand = "0.8" hex = "0.4" # Data structures -bytes = "1.0" +bytes = "1.11" crossbeam-channel = "0.5" uuid = { version = "1.0", features = ["v4", "serde"] } diff --git a/crates/macros/Cargo.toml b/crates/macros/Cargo.toml index 88bfd7a..3b1318f 100644 --- a/crates/macros/Cargo.toml +++ b/crates/macros/Cargo.toml @@ -11,7 +11,7 @@ syn = { version = "2.0", features = ["full"] } quote = "1.0" proc-macro2 = "1.0" inventory = { workspace = true } -bytes = "1.0" +bytes = "1.11" bevy_macro_utils = "0.17.2" [dev-dependencies] -- 2.49.1 From a120ca843411cfacb642ff11fa7b422e088a1821 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Feb 2026 20:24:53 +0000 Subject: [PATCH 2/3] Bump time from 0.3.44 to 0.3.47 in the cargo group across 1 directory Bumps the cargo group with 1 update in the / directory: [time](https://github.com/time-rs/time). Updates `time` from 0.3.44 to 0.3.47 - [Release notes](https://github.com/time-rs/time/releases) - [Changelog](https://github.com/time-rs/time/blob/main/CHANGELOG.md) - [Commits](https://github.com/time-rs/time/compare/v0.3.44...v0.3.47) --- updated-dependencies: - dependency-name: time dependency-version: 0.3.47 dependency-type: indirect dependency-group: cargo ... Signed-off-by: dependabot[bot] --- Cargo.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8fa903f..089b8e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5245,9 +5245,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" [[package]] name = "num-derive" @@ -7371,31 +7371,31 @@ dependencies = [ [[package]] name = "time" -version = "0.3.44" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", "itoa", "js-sys", "num-conv", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.24" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", -- 2.49.1 From 34bbf3946a86d9142d384e97db1911cab68fe00c Mon Sep 17 00:00:00 2001 From: Sienna Meridian Satterwhite Date: Fri, 6 Feb 2026 20:33:03 +0000 Subject: [PATCH 3/3] Prepare v0.1.1 release for crates.io - Rename `macros` crate to `libmarathon-macros` for better discoverability on crates.io - Update all imports from `macros::` to `libmarathon_macros::` - Add crates.io metadata (description, license, repository, homepage, etc.) - Bump version to 0.1.1 - Add version requirement for libmarathon-macros dependency --- Cargo.lock | 42 +++++++++---------- crates/app/Cargo.toml | 2 +- crates/app/src/cube.rs | 2 +- crates/libmarathon/Cargo.toml | 11 ++++- .../src/networking/sync_component.rs | 2 +- .../src/render/extract_component.rs | 2 +- .../src/render/extract_resource.rs | 2 +- crates/libmarathon/src/render/gpu_readback.rs | 2 +- crates/libmarathon/src/render/mod.rs | 2 +- .../src/render/render_graph/graph.rs | 2 +- .../src/render/render_graph/node.rs | 2 +- .../src/render/render_phase/mod.rs | 4 +- .../src/render/render_resource/bind_group.rs | 2 +- .../src/render/render_resource/specializer.rs | 2 +- .../src/render/texture/manual_texture_view.rs | 2 +- crates/libmarathon/src/render/view/mod.rs | 2 +- crates/libmarathon/src/sync.rs | 2 +- .../tests/sync_integration_headless.rs | 4 +- crates/macros/Cargo.toml | 8 +++- crates/macros/src/lib.rs | 2 +- crates/macros/tests/basic_macro_test.rs | 4 +- 21 files changed, 57 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 975e336..de4ccce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -276,7 +276,7 @@ dependencies = [ "iroh", "iroh-gossip", "libmarathon", - "macros", + "libmarathon-macros", "objc", "rand 0.8.5", "raw-window-handle", @@ -4535,7 +4535,7 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libmarathon" -version = "0.1.0" +version = "0.1.1" dependencies = [ "anyhow", "async-channel", @@ -4584,7 +4584,7 @@ dependencies = [ "iroh", "iroh-gossip", "itertools 0.14.0", - "macros", + "libmarathon-macros", "naga", "nonmax", "offset-allocator", @@ -4614,6 +4614,24 @@ dependencies = [ "winit", ] +[[package]] +name = "libmarathon-macros" +version = "0.1.1" +dependencies = [ + "anyhow", + "bevy", + "bevy_macro_utils", + "bytes", + "inventory", + "libmarathon", + "proc-macro2", + "quote", + "rkyv", + "serde", + "syn", + "tracing", +] + [[package]] name = "libredox" version = "0.1.10" @@ -4728,24 +4746,6 @@ dependencies = [ "libc", ] -[[package]] -name = "macros" -version = "0.1.0" -dependencies = [ - "anyhow", - "bevy", - "bevy_macro_utils", - "bytes", - "inventory", - "libmarathon", - "proc-macro2", - "quote", - "rkyv", - "serde", - "syn", - "tracing", -] - [[package]] name = "mainline" version = "6.0.1" diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml index d19b763..436669d 100644 --- a/crates/app/Cargo.toml +++ b/crates/app/Cargo.toml @@ -11,7 +11,7 @@ headless = [] [dependencies] libmarathon = { path = "../libmarathon" } -macros = { path = "../macros" } +libmarathon-macros = { path = "../macros" } inventory.workspace = true rkyv.workspace = true bevy = { version = "0.17.2", default-features = false, features = [ diff --git a/crates/app/src/cube.rs b/crates/app/src/cube.rs index a1480d4..3c48a1a 100644 --- a/crates/app/src/cube.rs +++ b/crates/app/src/cube.rs @@ -8,7 +8,7 @@ use uuid::Uuid; /// /// This component contains all the data needed for rendering a cube. /// The `#[synced]` attribute automatically handles network synchronization. -#[macros::synced] +#[libmarathon_macros::synced] pub struct CubeMarker { /// RGB color values (0.0 to 1.0) pub color_r: f32, diff --git a/crates/libmarathon/Cargo.toml b/crates/libmarathon/Cargo.toml index 1fc0708..3641133 100644 --- a/crates/libmarathon/Cargo.toml +++ b/crates/libmarathon/Cargo.toml @@ -1,7 +1,14 @@ [package] name = "libmarathon" -version = "0.1.0" +version = "0.1.1" edition.workspace = true +description = "A peer-to-peer game engine development kit with CRDT-based state synchronization" +license = "MIT" +repository = "https://github.com/r3t-studios/marathon" +homepage = "https://github.com/r3t-studios/marathon" +readme = "../../README.md" +keywords = ["gamedev", "p2p", "crdt", "multiplayer", "bevy"] +categories = ["game-engines", "network-programming"] [dependencies] anyhow.workspace = true @@ -23,7 +30,7 @@ bevy_math = "0.17.2" bevy_mesh = "0.17.2" bevy_platform = { version = "0.17.2", default-features = false } bevy_reflect = "0.17.2" -macros = { path = "../macros" } +libmarathon-macros = { version = "0.1.1", path = "../macros" } bevy_shader = "0.17.2" bevy_tasks = "0.17.2" bevy_time = "0.17.2" diff --git a/crates/libmarathon/src/networking/sync_component.rs b/crates/libmarathon/src/networking/sync_component.rs index 3beb2e5..cdd0f63 100644 --- a/crates/libmarathon/src/networking/sync_component.rs +++ b/crates/libmarathon/src/networking/sync_component.rs @@ -109,7 +109,7 @@ pub trait SyncComponent: Component + Reflect + Sized { /// /// ```no_compile /// // Define a synced component with the #[synced] attribute -/// #[macros::synced] +/// #[libmarathon_macros::synced] /// pub struct CubeMarker { /// pub color_r: f32, /// pub size: f32, diff --git a/crates/libmarathon/src/render/extract_component.rs b/crates/libmarathon/src/render/extract_component.rs index 47f4bb1..9db975e 100644 --- a/crates/libmarathon/src/render/extract_component.rs +++ b/crates/libmarathon/src/render/extract_component.rs @@ -15,7 +15,7 @@ use bevy_ecs::{ }; use core::{marker::PhantomData, ops::Deref}; -pub use macros::ExtractComponent; +pub use libmarathon_macros::ExtractComponent; /// Stores the index of a uniform inside of [`ComponentUniforms`]. #[derive(Component)] diff --git a/crates/libmarathon/src/render/extract_resource.rs b/crates/libmarathon/src/render/extract_resource.rs index d1be4a9..9b10dd6 100644 --- a/crates/libmarathon/src/render/extract_resource.rs +++ b/crates/libmarathon/src/render/extract_resource.rs @@ -2,7 +2,7 @@ use core::marker::PhantomData; use bevy_app::{App, Plugin}; use bevy_ecs::prelude::*; -pub use macros::ExtractResource; +pub use libmarathon_macros::ExtractResource; use bevy_utils::once; use crate::render::{Extract, ExtractSchedule, RenderApp}; diff --git a/crates/libmarathon/src/render/gpu_readback.rs b/crates/libmarathon/src/render/gpu_readback.rs index 2c09086..012ad52 100644 --- a/crates/libmarathon/src/render/gpu_readback.rs +++ b/crates/libmarathon/src/render/gpu_readback.rs @@ -26,7 +26,7 @@ use bevy_ecs::{ use bevy_image::{Image, TextureFormatPixelInfo}; use bevy_platform::collections::HashMap; use bevy_reflect::Reflect; -use macros::ExtractComponent; +use libmarathon_macros::ExtractComponent; use encase::internal::ReadFrom; use encase::private::Reader; use encase::ShaderType; diff --git a/crates/libmarathon/src/render/mod.rs b/crates/libmarathon/src/render/mod.rs index 72125e8..4f446b9 100644 --- a/crates/libmarathon/src/render/mod.rs +++ b/crates/libmarathon/src/render/mod.rs @@ -29,7 +29,7 @@ pub use crate::define_atomic_id; // Re-export derive macros from macros -pub use macros::{AsBindGroup, RenderLabel, RenderSubGraph}; +pub use libmarathon_macros::{AsBindGroup, RenderLabel, RenderSubGraph}; #[cfg(target_pointer_width = "16")] compile_error!("bevy_render cannot compile for a 16-bit platform."); diff --git a/crates/libmarathon/src/render/render_graph/graph.rs b/crates/libmarathon/src/render/render_graph/graph.rs index 83e8288..7f8720e 100644 --- a/crates/libmarathon/src/render/render_graph/graph.rs +++ b/crates/libmarathon/src/render/render_graph/graph.rs @@ -11,7 +11,7 @@ use core::fmt::Debug; use super::{EdgeExistence, InternedRenderLabel, IntoRenderNodeArray}; -pub use macros::RenderSubGraph; +pub use libmarathon_macros::RenderSubGraph; define_label!( #[diagnostic::on_unimplemented( diff --git a/crates/libmarathon/src/render/render_graph/node.rs b/crates/libmarathon/src/render/render_graph/node.rs index df3ee5d..fc078e8 100644 --- a/crates/libmarathon/src/render/render_graph/node.rs +++ b/crates/libmarathon/src/render/render_graph/node.rs @@ -18,7 +18,7 @@ use downcast_rs::{impl_downcast, Downcast}; use thiserror::Error; use variadics_please::all_tuples_with_size; -pub use macros::RenderLabel; +pub use libmarathon_macros::RenderLabel; use super::{InternedRenderSubGraph, RenderSubGraph}; diff --git a/crates/libmarathon/src/render/render_phase/mod.rs b/crates/libmarathon/src/render/render_phase/mod.rs index 9a89fa9..77b53ab 100644 --- a/crates/libmarathon/src/render/render_phase/mod.rs +++ b/crates/libmarathon/src/render/render_phase/mod.rs @@ -68,7 +68,7 @@ use bevy_ecs::{ system::{lifetimeless::SRes, SystemParamItem}, }; use crate::render::renderer::RenderAdapterInfo; -pub use macros::ShaderLabel; +pub use libmarathon_macros::ShaderLabel; use core::{fmt::Debug, hash::Hash, iter, marker::PhantomData, ops::Range, slice::SliceIndex}; use smallvec::SmallVec; use tracing::warn; @@ -85,7 +85,7 @@ define_label!( /// A shorthand for `Interned`. pub type InternedShaderLabel = Interned; -pub use macros::DrawFunctionLabel; +pub use libmarathon_macros::DrawFunctionLabel; define_label!( #[diagnostic::on_unimplemented( diff --git a/crates/libmarathon/src/render/render_resource/bind_group.rs b/crates/libmarathon/src/render/render_resource/bind_group.rs index c7b6f7e..e1a372a 100644 --- a/crates/libmarathon/src/render/render_resource/bind_group.rs +++ b/crates/libmarathon/src/render/render_resource/bind_group.rs @@ -7,7 +7,7 @@ use crate::render::{ }; use bevy_derive::{Deref, DerefMut}; use bevy_ecs::system::{SystemParam, SystemParamItem}; -pub use macros::AsBindGroup; +pub use libmarathon_macros::AsBindGroup; use core::ops::Deref; use encase::ShaderType; use thiserror::Error; diff --git a/crates/libmarathon/src/render/render_resource/specializer.rs b/crates/libmarathon/src/render/render_resource/specializer.rs index 31edf62..c816f45 100644 --- a/crates/libmarathon/src/render/render_resource/specializer.rs +++ b/crates/libmarathon/src/render/render_resource/specializer.rs @@ -14,7 +14,7 @@ use core::{hash::Hash, marker::PhantomData}; use tracing::error; use variadics_please::all_tuples; -pub use macros::{Specializer, SpecializerKey}; +pub use libmarathon_macros::{Specializer, SpecializerKey}; /// Defines a type that is able to be "specialized" and cached by creating and transforming /// its descriptor type. This is implemented for [`RenderPipeline`] and [`ComputePipeline`], and diff --git a/crates/libmarathon/src/render/texture/manual_texture_view.rs b/crates/libmarathon/src/render/texture/manual_texture_view.rs index 898d041..27b020c 100644 --- a/crates/libmarathon/src/render/texture/manual_texture_view.rs +++ b/crates/libmarathon/src/render/texture/manual_texture_view.rs @@ -3,7 +3,7 @@ use bevy_ecs::{prelude::Component, resource::Resource}; use bevy_image::BevyDefault; use bevy_math::UVec2; use bevy_platform::collections::HashMap; -use macros::ExtractResource; +use libmarathon_macros::ExtractResource; use wgpu::TextureFormat; use crate::render::render_resource::TextureView; diff --git a/crates/libmarathon/src/render/view/mod.rs b/crates/libmarathon/src/render/view/mod.rs index d116455..c5c41ab 100644 --- a/crates/libmarathon/src/render/view/mod.rs +++ b/crates/libmarathon/src/render/view/mod.rs @@ -33,7 +33,7 @@ use bevy_image::{BevyDefault as _, ToExtents}; use bevy_math::{mat3, vec2, vec3, Mat3, Mat4, UVec4, Vec2, Vec3, Vec4, Vec4Swizzles}; use bevy_platform::collections::{hash_map::Entry, HashMap}; use bevy_reflect::{std_traits::ReflectDefault, Reflect}; -use macros::ExtractComponent; +use libmarathon_macros::ExtractComponent; use bevy_shader::load_shader_library; use bevy_transform::components::GlobalTransform; use core::{ diff --git a/crates/libmarathon/src/sync.rs b/crates/libmarathon/src/sync.rs index 98accd2..a4ede84 100644 --- a/crates/libmarathon/src/sync.rs +++ b/crates/libmarathon/src/sync.rs @@ -18,7 +18,7 @@ use serde::{ Serialize, }; // TODO: Re-export the Synced derive macro (not part of bevy_render_macros) -// pub use macros::Synced; +// pub use libmarathon_macros::Synced; pub type NodeId = uuid::Uuid; diff --git a/crates/libmarathon/tests/sync_integration_headless.rs b/crates/libmarathon/tests/sync_integration_headless.rs index bb52ecd..c75eef5 100644 --- a/crates/libmarathon/tests/sync_integration_headless.rs +++ b/crates/libmarathon/tests/sync_integration_headless.rs @@ -70,7 +70,7 @@ use uuid::Uuid; // ============================================================================ /// Simple position component for testing sync -#[macros::synced] +#[libmarathon_macros::synced] #[derive(Reflect, PartialEq)] #[reflect(Component)] struct TestPosition { @@ -79,7 +79,7 @@ struct TestPosition { } /// Simple health component for testing sync -#[macros::synced] +#[libmarathon_macros::synced] #[derive(Reflect, PartialEq)] #[reflect(Component)] struct TestHealth { diff --git a/crates/macros/Cargo.toml b/crates/macros/Cargo.toml index 88bfd7a..95749d2 100644 --- a/crates/macros/Cargo.toml +++ b/crates/macros/Cargo.toml @@ -1,7 +1,11 @@ [package] -name = "macros" -version = "0.1.0" +name = "libmarathon-macros" +version = "0.1.1" edition.workspace = true +description = "Procedural macros for the Marathon game engine" +license = "MIT" +repository = "https://github.com/r3t-studios/marathon" +homepage = "https://github.com/r3t-studios/marathon" [lib] proc-macro = true diff --git a/crates/macros/src/lib.rs b/crates/macros/src/lib.rs index 88859c1..fadb8e6 100644 --- a/crates/macros/src/lib.rs +++ b/crates/macros/src/lib.rs @@ -160,7 +160,7 @@ pub fn derive_draw_function_label(input: TokenStream) -> TokenStream { /// # Example /// /// ```no_compile -/// use macros::synced; +/// use libmarathon_macros::synced; /// /// #[synced] /// pub struct CubeMarker { diff --git a/crates/macros/tests/basic_macro_test.rs b/crates/macros/tests/basic_macro_test.rs index b8ca633..e3e3eef 100644 --- a/crates/macros/tests/basic_macro_test.rs +++ b/crates/macros/tests/basic_macro_test.rs @@ -2,7 +2,7 @@ use bevy::prelude::*; // Test 1: Basic struct with synced attribute compiles -#[macros::synced] +#[libmarathon_macros::synced] struct Health { current: f32, } @@ -58,7 +58,7 @@ fn test_health_is_clone_and_copy() { } // Test 2: Struct with multiple fields -#[macros::synced] +#[libmarathon_macros::synced] struct Position { x: f32, y: f32, -- 2.49.1