refactor!: Use crates.io version of ggrs

johanhelsing · Sep 13, 2021 · 781116c · 781116c
1 parent 97b1e11
commit 781116c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/matchbox_demo/Cargo.toml b/matchbox_demo/Cargo.toml
@@ -34,19 +34,16 @@ 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"
 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
@@ -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 }