From 781116c5c51995f5de60be70d5b6c9ab9dfa5ac0 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Mon, 13 Sep 2021 18:27:49 +0200 Subject: [PATCH] refactor!: Use crates.io version of ggrs --- Cargo.lock | 63 +++++++++++++++++++------------------- matchbox_demo/Cargo.toml | 7 ++--- matchbox_socket/Cargo.toml | 4 +-- 3 files changed, 35 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 045c402f..4fbe7123 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -224,7 +224,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bevy" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_internal", ] @@ -238,7 +238,7 @@ checksum = "0d5f2f58f0aec3c50a20799792c3705e80dd7df327e79791cacec197e84e5e61" [[package]] name = "bevy_app" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_derive", "bevy_ecs", @@ -251,7 +251,7 @@ dependencies = [ [[package]] name = "bevy_asset" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "anyhow", "bevy_app", @@ -278,7 +278,7 @@ dependencies = [ [[package]] name = "bevy_core" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_app", "bevy_derive", @@ -293,7 +293,7 @@ dependencies = [ [[package]] name = "bevy_derive" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "Inflector", "bevy_macro_utils", @@ -304,7 +304,7 @@ dependencies = [ [[package]] name = "bevy_diagnostic" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_app", "bevy_core", @@ -316,7 +316,7 @@ dependencies = [ [[package]] name = "bevy_ecs" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "async-channel", "bevy_ecs_macros", @@ -334,7 +334,7 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -345,7 +345,7 @@ dependencies = [ [[package]] name = "bevy_ggrs" version = "0.1.0" -source = "git+https://github.com/gschup/bevy_ggrs?branch=main#3524860d4634ace988f97405df05b785634e45c3" +source = "git+https://github.com/gschup/bevy_ggrs?branch=main#41af4799ad9067f8dd6652b5245595a680127991" dependencies = [ "bevy", "ggrs", @@ -354,7 +354,7 @@ dependencies = [ [[package]] name = "bevy_gltf" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "anyhow", "base64", @@ -377,7 +377,7 @@ dependencies = [ [[package]] name = "bevy_input" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_app", "bevy_ecs", @@ -388,7 +388,7 @@ dependencies = [ [[package]] name = "bevy_internal" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_app", "bevy_asset", @@ -419,7 +419,7 @@ dependencies = [ [[package]] name = "bevy_log" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "android_log-sys", "bevy_app", @@ -432,7 +432,7 @@ dependencies = [ [[package]] name = "bevy_macro_utils" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "cargo-manifest", "syn", @@ -441,7 +441,7 @@ dependencies = [ [[package]] name = "bevy_math" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_reflect", "glam 0.18.0", @@ -450,7 +450,7 @@ dependencies = [ [[package]] name = "bevy_pbr" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_app", "bevy_asset", @@ -466,7 +466,7 @@ dependencies = [ [[package]] name = "bevy_reflect" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_reflect_derive", "bevy_utils", @@ -482,7 +482,7 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -494,7 +494,7 @@ dependencies = [ [[package]] name = "bevy_render" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "anyhow", "bevy-glsl-to-spirv", @@ -524,7 +524,7 @@ dependencies = [ [[package]] name = "bevy_scene" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "anyhow", "bevy_app", @@ -542,7 +542,7 @@ dependencies = [ [[package]] name = "bevy_sprite" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_app", "bevy_asset", @@ -565,7 +565,7 @@ dependencies = [ [[package]] name = "bevy_tasks" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "async-channel", "async-executor", @@ -578,7 +578,7 @@ dependencies = [ [[package]] name = "bevy_text" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "ab_glyph", "anyhow", @@ -600,7 +600,7 @@ dependencies = [ [[package]] name = "bevy_transform" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_app", "bevy_ecs", @@ -613,7 +613,7 @@ dependencies = [ [[package]] name = "bevy_ui" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_app", "bevy_asset", @@ -638,7 +638,7 @@ dependencies = [ [[package]] name = "bevy_utils" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "ahash 0.7.4", "bevy_derive", @@ -666,7 +666,7 @@ dependencies = [ [[package]] name = "bevy_wgpu" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_app", "bevy_asset", @@ -687,7 +687,7 @@ dependencies = [ [[package]] name = "bevy_window" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "bevy_app", "bevy_ecs", @@ -699,7 +699,7 @@ dependencies = [ [[package]] name = "bevy_winit" version = "0.5.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#51a5070cd2d3d7262616b2efc8a6cd3b1991d7e6" +source = "git+https://github.com/bevyengine/bevy?branch=main#9effc3e9b3d2fbeaf52d3a57a79ef9208fe95475" dependencies = [ "approx", "bevy_app", @@ -1745,8 +1745,9 @@ dependencies = [ [[package]] name = "ggrs" -version = "0.4.4" -source = "git+https://github.com/gschup/ggrs?branch=main#6ab94d96fbebcfe096f9de13ff8d60b1a2b4fa73" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f114f5e112e4bafa689b96c8840ec6228d94ba829012789e00bdaea17bcc5907" dependencies = [ "bincode", "bitfield-rle", diff --git a/matchbox_demo/Cargo.toml b/matchbox_demo/Cargo.toml index 36890b25..16044e88 100644 --- a/matchbox_demo/Cargo.toml +++ b/matchbox_demo/Cargo.toml @@ -34,7 +34,9 @@ serde_qs = "0.8.4" wasm-bindgen = "0.2" [dependencies] +matchbox_socket = { path = "../matchbox_socket", features = ["ggrs-socket"] } bevy = { git = "https://github.com/bevyengine/bevy", branch = "main", default-features = false } +ggrs = "0.5" bevy_ggrs = { git = "https://github.com/gschup/bevy_ggrs", branch = "main" } bevy_webgl2 = { git = "https://github.com/mrk-its/bevy_webgl2", branch = "master", optional = true } clap = "3.0.0-beta.2" @@ -42,11 +44,6 @@ serde = "1.0" winit = {version = "0.25.0"} log = "0.4" -matchbox_socket = { path = "../matchbox_socket", features = ["ggrs-socket"] } - -# TODO: 0.4 is missing required patches, and 0.5 is not yet released. -ggrs = { git = "https://github.com/gschup/ggrs", branch = "main" } - # [profile.dev] # opt-level = 1 diff --git a/matchbox_socket/Cargo.toml b/matchbox_socket/Cargo.toml index 51352524..63d14688 100644 --- a/matchbox_socket/Cargo.toml +++ b/matchbox_socket/Cargo.toml @@ -36,7 +36,5 @@ web-sys = { version = "0.3.22", default-features = false, features = [ log = { version = "0.4", default-features = false } # ggrs-socket -# ggrs = { version = "0.5", default-features = false, optional = true } -# TODO: 0.4 doesn't is missing required patches, and 0.5 is not yet released. -ggrs = { git = "https://github.com/gschup/ggrs", branch = "main", default-features = false, optional = true } +ggrs = { version = "0.5", default-features = false, optional = true } bincode = { version = "1.3", default-features = false, optional = true }