diff --git a/Cargo.toml b/Cargo.toml index ac60a47a..cdec490e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,38 +18,38 @@ members = ["flax-derive", "asteroids"] [dependencies] flax-derive = { path = "./flax-derive", version = "0.5.0", optional = true } -flume = { version = "0.10.14", default_features = false, optional = true } +flume = { version = "0.11.0", default_features = false, optional = true } -atomic_refcell = { version = "0.1.10", default_features = false } -bitflags = { version = "2.3.1", default_features = false } -anyhow = { version = "1.0.71", default_features = false } -itertools = "0.10.5" -rayon = { version = "1.7.0", default_features = false, optional = true } -tokio = { version = "1.28.1", default_features = false, features = [ +atomic_refcell = { version = "0.1.13", default_features = false } +bitflags = { version = "2.4.1", default_features = false } +anyhow = { version = "1.0.75", default_features = false } +itertools = "0.11.0" +rayon = { version = "1.8.0", default_features = false, optional = true } +tokio = { version = "1.33.0", default_features = false, features = [ "sync", ], optional = true } -smallvec = { version = "1.10.0", default_features = false } -tracing = { version = "0.1.37", optional = true } -tynm = "0.1.7" -serde = { version = "1.0.163", features = ["derive"], optional = true } -erased-serde = { version = "0.3.25", features = [], optional = true } -once_cell = "1.17.1" +smallvec = { version = "1.11.1", default_features = false } +tracing = { version = "0.1.40", optional = true } +tynm = "0.1.9" +serde = { version = "1.0.190", features = ["derive"], optional = true } +erased-serde = { version = "0.3.31", features = [], optional = true } +once_cell = "1.18.0" [dev-dependencies] -tokio = { version = "1.28.1", features = ["test-util", "macros"] } -futures = "0.3.28" -itertools = { version = "0.10.5", default_features = false } +tokio = { version = "1.33.0", features = ["test-util", "macros"] } +futures = "0.3.29" +itertools = { version = "0.11.0", default_features = false } tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } -serde_json = "1.0.96" -glam = { version = "0.24.0", features = ["rand", "serde", "scalar-math"] } +serde_json = "1.0.107" +glam = { version = "0.24.2", features = ["rand", "serde", "scalar-math"] } rand = "0.8.5" -tracing-tree = "0.2.3" +tracing-tree = "0.2.5" bincode = "1.3.3" -ron = "0.8.0" -tracing = "0.1.37" -criterion = "0.4.0" -pretty_assertions = "1.3.0" +ron = "0.8.1" +tracing = "0.1.40" +criterion = "0.5.1" +pretty_assertions = "1.4.0" [profile.bench] debug = true diff --git a/Makefile.toml b/Makefile.toml deleted file mode 100644 index 0daf17a9..00000000 --- a/Makefile.toml +++ /dev/null @@ -1,26 +0,0 @@ -[config] -default_to_workspace = false -skip_core_tasks = true - -[tasks.build_asteroids] -command = "cargo" -args = [ - "build", - "--package", - "asteroids", - "--manifest-path", - "asteroids/Cargo.toml", - "--release", - "--target", - "wasm32-unknown-unknown", -] - -[tasks.move_asteroids] -script_runner = "@shell" -script = ''' -rm -f ./asteroids/public/asteroids.wasm -mv ./target/wasm32-unknown-unknown/release/asteroids.wasm ./asteroids/public/ -''' - -[tasks.asteroids] -run_task = { name = ["build_asteroids", "move_asteroids"] } diff --git a/asteroids/Cargo.toml b/asteroids/Cargo.toml index 3dd1be13..03607034 100644 --- a/asteroids/Cargo.toml +++ b/asteroids/Cargo.toml @@ -8,13 +8,13 @@ publish = false [dependencies] flax = { path = "../", default-features = false, features = [ "flume", "derive", ] } -macroquad = "0.3.25" +macroquad = "0.4.4" # sapp-wasm = "=0.1.26" -flume = { version = "0.10.14", default_features = false } +flume = { version = "0.11.0", default_features = false } rand = { version = "0.8.5", default_features = false, features = ["std_rng"] } -tracing = "0.1.37" +tracing = "0.1.40" tracing-subscriber = "0.3.17" -tracing-tree = "0.2.3" -itertools = "0.10.5" +tracing-tree = "0.2.5" +itertools = "0.11.0" anyhow = "1.0.71" diff --git a/flax-derive/Cargo.toml b/flax-derive/Cargo.toml index 5477f175..7a81d939 100644 --- a/flax-derive/Cargo.toml +++ b/flax-derive/Cargo.toml @@ -14,12 +14,12 @@ license = "MIT" proc-macro = true [dependencies] -proc-macro2 = "1.0.58" -proc-macro-crate = "1.3.1" -syn = "2.0.16" -quote = "1.0.27" -itertools = "0.10.5" +proc-macro2 = "1.0.69" +proc-macro-crate = "2.0.0" +syn = "2.0.38" +quote = "1.0.33" +itertools = "0.11.0" [dev-dependencies] -glam = "0.24.0" -pretty_assertions = "1.3.0" +glam = "0.24.2" +pretty_assertions = "1.4.0" diff --git a/recipes.json b/recipes.json index e106ce6f..d7cd7db0 100644 --- a/recipes.json +++ b/recipes.json @@ -3,7 +3,7 @@ "cmd": "cargo run -p asteroids" }, "deploy-asteroids": { - "cmd": "cargo make asteroids" + "cmd": "./scripts/build_asteroids.sh" }, "check": { "cmd": "cargo check --all-features --tests --examples" diff --git a/scripts/build_asteroids.sh b/scripts/build_asteroids.sh new file mode 100755 index 00000000..21eea427 --- /dev/null +++ b/scripts/build_asteroids.sh @@ -0,0 +1,4 @@ +set -e +cargo build --release --package asteroids --target wasm32-unknown-unknown --manifest-path=asteroids/Cargo.toml + +mv ./target/wasm32-unknown-unknown/release/asteroids.wasm ./asteroids/public