Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
kayhhh committed Dec 9, 2024
1 parent 3ced2f6 commit 174f837
Show file tree
Hide file tree
Showing 15 changed files with 70 additions and 81 deletions.
66 changes: 33 additions & 33 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 22 additions & 22 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,36 @@ too_many_arguments = "allow"
type_complexity = "allow"

[workspace.dependencies]
anyhow = "1.0.82"
avian3d = { version = "0.1.0", features = ["simd"] }
axum = "0.7.5"
anyhow = "1.0.94"
avian3d = { version = "0.1.2", features = ["simd"] }
axum = "0.7.9"
axum-server = "0.7.1"
base64 = "0.22.0"
bevy = "0.14.0"
bevy-inspector-egui = "0.25.1"
base64 = "0.22.1"
bevy = "0.14.2"
bevy-inspector-egui = "0.25.2"
bevy_async_task = "0.2.0"
bevy_panorbit_camera = "0.19.0"
bevy_panorbit_camera = "0.19.5"
bevy_vr_controller = "0.1.1"
bevy_vrm = "0.0.12"
capnp = "0.19.4"
capnp-rpc = "0.19.1"
clap = { version = "4.5.4", features = ["derive"] }
capnp = "0.19.8"
capnp-rpc = "0.19.5"
clap = { version = "4.5.23", features = ["derive"] }
directories = "5.0.1"
dwn = { git = "https://github.com/unavi-xyz/dwn" }
glam = "0.28.0"
reqwest = "0.12.5"
semver = "1.0.22"
serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.115"
thiserror = "1.0.61"
tokio = { version = "1.40.0", features = ["macros", "rt", "time"] }
tracing = "0.1.40"
tracing-test = "0.2.4"
wasm-bindgen = "0.2.92"
wasm-bindgen-futures = "0.4.41"
web-sys = "0.3.70"
reqwest = "0.12.9"
semver = "1.0.23"
serde = { version = "1.0.215", features = ["derive"] }
serde_json = "1.0.133"
thiserror = "1.0.69"
tokio = { version = "1.42.0", features = ["macros", "rt", "time"] }
tracing = "0.1.41"
tracing-test = "0.2.5"
wasm-bindgen = "0.2.99"
wasm-bindgen-futures = "0.4.49"
web-sys = "0.3.76"
wit-bindgen-rt = { version = "0.23.0", features = ["bitflags"] }
wtransport = "0.3.0"
wtransport = "0.3.1"
xdid = "0.2.0"
xwt-core = { git = "https://github.com/kayhhh/xwt" }
xwt-wtransport = { git = "https://github.com/kayhhh/xwt" }
Expand Down
6 changes: 3 additions & 3 deletions crates/unavi-app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ web-sys = { workspace = true, features = [

[target.'cfg(not(target_family = "wasm"))'.dependencies]
bevy_oxr = "0.3.0"
image = { version = "0.25.2", default-features = false, features = ["png"] }
image = { version = "0.25.5", default-features = false, features = ["png"] }
reqwest.workspace = true
self_update = "0.41.0"
tempfile = "3.12.0"
tempfile = "3.14.0"
tokio.workspace = true
winit = { version = "0.30.5", default-features = false }
zip = { version = "2.2.0", default-features = false, features = ["deflate"] }
zip = { version = "2.2.1", default-features = false, features = ["deflate"] }

[build-dependencies]
unavi-constants = { path = "../unavi-constants" }
Expand Down
8 changes: 1 addition & 7 deletions crates/unavi-app/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
//! git submodule foreach git pull
//! ```
use std::sync::Arc;

use bevy::{
asset::AssetMetaCheck,
log::{Level, LogPlugin},
Expand All @@ -37,11 +35,7 @@ use bevy::{
};

use avian3d::prelude::*;
use dwn::{
core::store::{DataStore, RecordStore},
stores::NativeDbStore,
Dwn,
};
use dwn::Dwn;

#[cfg(not(target_family = "wasm"))]
pub mod native;
Expand Down
2 changes: 1 addition & 1 deletion crates/unavi-scripting/src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl ScriptEnvBuilder {
config.async_support(true);
config.wasm_component_model(true);

let engine = Engine::new(&config).expect("Failed to create wasm engine");
let engine = Engine::new(&config)?;

let mut store = Store::new(&engine, self.data);
let mut linker = Linker::new(store.engine());
Expand Down
2 changes: 1 addition & 1 deletion crates/unavi-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ clap.workspace = true
directories.workspace = true
dwn.workspace = true
tokio = { workspace = true, features = ["rt-multi-thread", "signal"] }
tracing-subscriber = "0.3.18"
tracing-subscriber = "0.3.19"
tracing.workspace = true
unavi-social-server = { path = "../unavi-social-server" }
unavi-world-host = { path = "../unavi-world-host" }
Expand Down
5 changes: 1 addition & 4 deletions crates/unavi-server/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
use std::{
path::PathBuf,
sync::LazyLock,
};
use std::{path::PathBuf, sync::LazyLock};

use anyhow::Result;
use clap::{Parser, Subcommand, ValueEnum};
Expand Down
2 changes: 1 addition & 1 deletion crates/unavi-social-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ edition.workspace = true

[dependencies]
axum-server.workspace = true
dwn-server = { version = "0.0.10", git = "https://github.com/unavi-xyz/dwn" }
dwn-server = { git = "https://github.com/unavi-xyz/dwn" }
dwn.workspace = true
tracing.workspace = true
1 change: 0 additions & 1 deletion crates/unavi-world-host/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use std::{
time::Duration,
};


use dwn::Dwn;
use tracing::info;

Expand Down
6 changes: 1 addition & 5 deletions crates/unavi-world/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

use bevy::prelude::*;
use wired_social::schemas::common::RecordLink;

Expand All @@ -17,10 +16,7 @@ impl Plugin for WorldPlugin {
app
// .add_event::<JoinHome>()
.init_state::<WorldState>()
.add_systems(
Startup,
scene::setup_lights,
)
.add_systems(Startup, scene::setup_lights)
.add_systems(
Update,
(
Expand Down
2 changes: 1 addition & 1 deletion crates/xwt-futures-io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ edition.workspace = true

[dependencies]
anyhow.workspace = true
futures-io = "0.3.30"
futures-io = "0.3.31"
tracing.workspace = true
xwt-core.workspace = true
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
(with pkgs; [
cargo-component
cargo-deny
cargo-edit
cargo-machete
cargo-rdme
cargo-release
Expand Down
2 changes: 1 addition & 1 deletion wasm/unavi-shapes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ crate-type = ["cdylib"]
[dependencies]
glam.workspace = true
hexasphere = "14.1.0"
parry3d = "0.17.0"
parry3d = "0.17.4"
wit-bindgen-rt.workspace = true

[package.metadata.component]
Expand Down
Loading

0 comments on commit 174f837

Please sign in to comment.