Skip to content

Commit

Permalink
Format toml files
Browse files Browse the repository at this point in the history
  • Loading branch information
garryod committed Mar 25, 2023
1 parent 1e2444e commit 0cd3777
Show file tree
Hide file tree
Showing 8 changed files with 71 additions and 30 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[workspace]
members = [
"matchbox_protocol",
"matchbox_socket",
"matchbox_server",
"examples/*",
"matchbox_protocol",
"matchbox_socket",
"matchbox_server",
"examples/*",
]
resolver = "2" # Important! Bevy/WGPU needs this!
2 changes: 1 addition & 1 deletion examples/bevy_ggrs/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[target.wasm32-unknown-unknown]
runner = "wasm-server-runner"
runner = "wasm-server-runner"
9 changes: 5 additions & 4 deletions examples/bevy_ggrs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ license = "MIT OR Apache-2.0"

[target.'cfg(target_arch = "wasm32")'.dependencies]
web-sys = { version = "0.3", features = [
"Document", "Location", # for getting args from query string
"Document",
"Location", # for getting args from query string
] }
serde_qs = "0.12"
wasm-bindgen = "0.2"
Expand All @@ -23,10 +24,10 @@ bevy = { version = "0.9", default-features = false, features = [
"bevy_winit",
"render",
"png",
"x11" # gh actions runners don't like wayland
"x11", # gh actions runners don't like wayland
] }
ggrs = "0.9"
bevy_ggrs = "0.11"
bytemuck = { version = "1.7", features=["derive"]}
bytemuck = { version = "1.7", features = ["derive"] }
clap = { version = "4.0", features = ["derive"] }
serde = "1.0"
serde = "1.0"
2 changes: 1 addition & 1 deletion examples/simple/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[target.wasm32-unknown-unknown]
runner = "wasm-server-runner"
runner = "wasm-server-runner"
14 changes: 11 additions & 3 deletions matchbox_protocol/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
[package]
name = "matchbox_protocol"
version = "0.1.0"
authors = ["Johan Helsing <[email protected]>", "Spencer C. Imbleau <[email protected]>"]
authors = [
"Johan Helsing <[email protected]>",
"Spencer C. Imbleau <[email protected]>",
]
description = "Common interfaces between matchbox_socket and matchbox_server"
edition = "2021"
license = "MIT OR Apache-2.0"
keywords = ["gamedev", "webrtc", "peer-to-peer", "networking", "wasm"]
categories = ["network-programming", "game-development", "wasm", "web-programming"]
categories = [
"network-programming",
"game-development",
"wasm",
"web-programming",
]
repository = "https://github.com/johanhelsing/matchbox"
homepage = "https://github.com/johanhelsing/matchbox"
readme = "../README.md"
Expand All @@ -21,4 +29,4 @@ uuid = { version = "1.3", features = ["serde"] }
derive_more = "0.99"

# JSON feature
serde_json = { version = "1.0", default-features = false, optional = true }
serde_json = { version = "1.0", default-features = false, optional = true }
9 changes: 7 additions & 2 deletions matchbox_server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ edition = "2021"
description = "A signalling server for WebRTC peer-to-peer full-mesh networking"
license = "MIT OR Apache-2.0"
keywords = ["gamedev", "webrtc", "peer-to-peer", "networking", "wasm"]
categories = ["network-programming", "game-development", "wasm", "web-programming"]
categories = [
"network-programming",
"game-development",
"wasm",
"web-programming",
]
repository = "https://github.com/johanhelsing/matchbox"
homepage = "https://github.com/johanhelsing/matchbox"
readme = "../README.md"
Expand All @@ -27,4 +32,4 @@ thiserror = "1.0"
tokio-stream = "0.1"

[dev-dependencies]
tokio-tungstenite = "0.18.0"
tokio-tungstenite = "0.18.0"
55 changes: 41 additions & 14 deletions matchbox_socket/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,39 @@ description = "Painless WebRTC peer-to-peer full-mesh networking socket"
edition = "2021"
license = "MIT OR Apache-2.0"
keywords = ["gamedev", "webrtc", "peer-to-peer", "networking", "wasm"]
categories = ["network-programming", "game-development", "wasm", "web-programming"]
categories = [
"network-programming",
"game-development",
"wasm",
"web-programming",
]
repository = "https://github.com/johanhelsing/matchbox"

[features]
ggrs-socket = ["dep:bincode", "dep:ggrs"]

[dependencies]
matchbox_protocol = { path = "../matchbox_protocol", default-features = false }
futures-channel = { version = "0.3", features = ["sink"], default-features = false }
futures-channel = { version = "0.3", features = [
"sink",
], default-features = false }
futures = { version = "0.3", default-features = false }
futures-timer = { version = "3.0", default-features = false }
futures-util = { version = "0.3", default-features = false, features = [
"sink", "async-await-macro", "channel"
"sink",
"async-await-macro",
"channel",
] }
serde = { version = "1.0", default-features = false, features = ["derive"] }
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
log = { version = "0.4", default-features = false }
thiserror = "1.0"
cfg-if = "1.0"
async-trait = { version = "0.1.64" }
once_cell = { version = "1.17", default-features = false, features = ["race", "alloc"] }
once_cell = { version = "1.17", default-features = false, features = [
"race",
"alloc",
] }
crossbeam-channel = "0.5"

# ggrs-socket
Expand All @@ -36,24 +48,39 @@ bincode = { version = "1.3", default-features = false, optional = true }
[target.'cfg(target_arch = "wasm32")'.dependencies]
ws_stream_wasm = { version = "0.7", default-features = false }
wasm-bindgen-futures = { version = "0.4", default-features = false }
wasm-bindgen = { version = "0.2", features = [ "serde-serialize" ], default-features = false }
futures-timer = { version = "3.0", default-features = false, features = ["wasm-bindgen"] }
wasm-bindgen = { version = "0.2", features = [
"serde-serialize",
], default-features = false }
futures-timer = { version = "3.0", default-features = false, features = [
"wasm-bindgen",
] }
js-sys = { version = "0.3", default-features = false }
web-sys = { version = "0.3.22", default-features = false, features = [
"MessageEvent",
"RtcPeerConnection",
"RtcSdpType", "RtcSessionDescription", "RtcSessionDescriptionInit",
"RtcIceGatheringState", "RtcIceCandidate", "RtcIceCandidateInit", "RtcPeerConnectionIceEvent",
"RtcIceConnectionState",
"RtcConfiguration", "RtcDataChannel", "RtcDataChannelInit", "RtcDataChannelType",
"MessageEvent",
"RtcPeerConnection",
"RtcSdpType",
"RtcSessionDescription",
"RtcSessionDescriptionInit",
"RtcIceGatheringState",
"RtcIceCandidate",
"RtcIceCandidateInit",
"RtcPeerConnectionIceEvent",
"RtcIceConnectionState",
"RtcConfiguration",
"RtcDataChannel",
"RtcDataChannelInit",
"RtcDataChannelType",
] }
serde-wasm-bindgen = { version = "0.5" }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
async-tungstenite = { version = "0.20", default-features = false, features = [ "async-std-runtime", "async-tls" ] }
async-tungstenite = { version = "0.20", default-features = false, features = [
"async-std-runtime",
"async-tls",
] }
webrtc = { version = "0.7", default-features = false }
bytes = { version = "1.1", default-features = false }
async-compat = { version = "0.2.1", default-features = false }

[dev-dependencies]
futures-test = { version = "0.3" }
futures-test = { version = "0.3" }
2 changes: 1 addition & 1 deletion rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
imports_granularity = "Crate"
max_width = 100
comment_width = 100
wrap_comments = true
wrap_comments = true

0 comments on commit 0cd3777

Please sign in to comment.