From aeb42a8c735b20b33bddc63555928970bf64ab2a Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 10 Aug 2023 12:38:50 +0200 Subject: [PATCH 1/5] chore: Bump versions to 0.7.0 --- Cargo.lock | 12 ++++++------ bevy_matchbox/Cargo.toml | 2 +- examples/bevy_ggrs/Cargo.toml | 2 +- matchbox_protocol/Cargo.toml | 2 +- matchbox_server/Cargo.toml | 2 +- matchbox_signaling/Cargo.toml | 2 +- matchbox_socket/Cargo.toml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 10dd83e3..355be219 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -865,7 +865,7 @@ dependencies = [ [[package]] name = "bevy_ggrs_example" -version = "0.6.0" +version = "0.7.0" dependencies = [ "bevy", "bevy_ggrs", @@ -1024,7 +1024,7 @@ dependencies = [ [[package]] name = "bevy_matchbox" -version = "0.6.0" +version = "0.7.0" dependencies = [ "bevy", "cfg-if 1.0.0", @@ -3065,7 +3065,7 @@ dependencies = [ [[package]] name = "matchbox_protocol" -version = "0.6.0" +version = "0.7.0" dependencies = [ "cfg-if 1.0.0", "derive_more", @@ -3076,7 +3076,7 @@ dependencies = [ [[package]] name = "matchbox_server" -version = "0.6.0" +version = "0.7.0" dependencies = [ "async-trait", "axum", @@ -3098,7 +3098,7 @@ dependencies = [ [[package]] name = "matchbox_signaling" -version = "0.6.0" +version = "0.7.0" dependencies = [ "async-trait", "axum", @@ -3120,7 +3120,7 @@ dependencies = [ [[package]] name = "matchbox_socket" -version = "0.6.1" +version = "0.7.0" dependencies = [ "async-compat", "async-trait", diff --git a/bevy_matchbox/Cargo.toml b/bevy_matchbox/Cargo.toml index 79998be7..f7ba3310 100644 --- a/bevy_matchbox/Cargo.toml +++ b/bevy_matchbox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_matchbox" -version = "0.6.0" +version = "0.7.0" authors = [ "Johan Helsing ", "Garry O'Donnell "] description = "A demo game where two web browser can connect and move boxes around" edition = "2021" diff --git a/matchbox_protocol/Cargo.toml b/matchbox_protocol/Cargo.toml index 7d7f6061..d194e96d 100644 --- a/matchbox_protocol/Cargo.toml +++ b/matchbox_protocol/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "matchbox_protocol" -version = "0.6.0" +version = "0.7.0" authors = [ "Johan Helsing ", "Spencer C. Imbleau ", diff --git a/matchbox_server/Cargo.toml b/matchbox_server/Cargo.toml index d9b38ab0..97c68ea5 100644 --- a/matchbox_server/Cargo.toml +++ b/matchbox_server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "matchbox_server" -version = "0.6.0" +version = "0.7.0" authors = ["Johan Helsing "] edition = "2021" description = "A signaling server for WebRTC peer-to-peer full-mesh networking" diff --git a/matchbox_signaling/Cargo.toml b/matchbox_signaling/Cargo.toml index 66587c18..6e5c469a 100644 --- a/matchbox_signaling/Cargo.toml +++ b/matchbox_signaling/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "matchbox_signaling" -version = "0.6.0" +version = "0.7.0" authors = [ "Johan Helsing ", "Spencer C. Imbleau ", diff --git a/matchbox_socket/Cargo.toml b/matchbox_socket/Cargo.toml index 0f5fd02c..50188dda 100644 --- a/matchbox_socket/Cargo.toml +++ b/matchbox_socket/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "matchbox_socket" -version = "0.6.1" +version = "0.7.0" authors = ["Johan Helsing "] description = "Painless WebRTC peer-to-peer full-mesh networking socket" edition = "2021" From a86a2df28e4ed02bb9751e386801f5daac17e483 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 10 Aug 2023 12:39:51 +0200 Subject: [PATCH 2/5] docs: Update version support table --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 17842c2d..07927eda 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,9 @@ The Matchbox project contains: - [bevy_matchbox](https://github.com/johanhelsing/matchbox/tree/main/bevy_matchbox): A `matchbox_socket` integration for the [Bevy](https://bevyengine.org/) game engine | bevy | bevy_matchbox | |-------|---------------| - | < 0.9 | Unsupported | + | 0.11 | 0.7, main | | 0.10 | 0.6 | - | 0.11 | 0.7 | + | < 0.9 | Unsupported | ## Examples From fa4babe22ddbcc1820f4dc51d9b39d6d7ee2b7f4 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Fri, 11 Aug 2023 10:56:18 +0200 Subject: [PATCH 3/5] fix: Add missing version field preventing publishing Regression in 9d25e6 Cargo requires an explicit version when publishing to crates.io. --- matchbox_signaling/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matchbox_signaling/Cargo.toml b/matchbox_signaling/Cargo.toml index 6e5c469a..341ba58f 100644 --- a/matchbox_signaling/Cargo.toml +++ b/matchbox_signaling/Cargo.toml @@ -18,7 +18,7 @@ categories = [ repository = "https://github.com/johanhelsing/matchbox" [dependencies] -matchbox_protocol = { path = "../matchbox_protocol", features = ["json"] } +matchbox_protocol = { version = "0.7", path = "../matchbox_protocol", features = ["json"] } axum = { version = "0.6", features = ["ws"] } hyper = { version = "0.14", features = ["server"] } tracing = { version = "0.1", features = ["log"] } From 37f34d8ad210521ecd875fa1558b26cb70dfb249 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Fri, 11 Aug 2023 11:00:49 +0200 Subject: [PATCH 4/5] Add missing version fields preventing publishing --- bevy_matchbox/Cargo.toml | 4 ++-- matchbox_server/Cargo.toml | 4 ++-- matchbox_socket/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bevy_matchbox/Cargo.toml b/bevy_matchbox/Cargo.toml index f7ba3310..c97dcf01 100644 --- a/bevy_matchbox/Cargo.toml +++ b/bevy_matchbox/Cargo.toml @@ -25,8 +25,8 @@ signaling = ["matchbox_signaling"] [dependencies] bevy = { version = "0.11", default-features = false } -matchbox_socket = { path = "../matchbox_socket" } +matchbox_socket = { version = "0.7", path = "../matchbox_socket" } cfg-if = "1.0" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -matchbox_signaling = { path = "../matchbox_signaling", optional = true } +matchbox_signaling = { version = "0.7", path = "../matchbox_signaling", optional = true } diff --git a/matchbox_server/Cargo.toml b/matchbox_server/Cargo.toml index 97c68ea5..2dd2400d 100644 --- a/matchbox_server/Cargo.toml +++ b/matchbox_server/Cargo.toml @@ -17,8 +17,8 @@ homepage = "https://github.com/johanhelsing/matchbox" readme = "../README.md" [dependencies] -matchbox_signaling = { path = "../matchbox_signaling" } -matchbox_protocol = { path = "../matchbox_protocol", features = ["json"] } +matchbox_signaling = { version = "0.7", path = "../matchbox_signaling" } +matchbox_protocol = { version = "0.7", path = "../matchbox_protocol", features = ["json"] } async-trait = "0.1" axum = { version = "0.6", features = ["ws"] } tracing = { version = "0.1", features = ["log"] } diff --git a/matchbox_socket/Cargo.toml b/matchbox_socket/Cargo.toml index 50188dda..b916109c 100644 --- a/matchbox_socket/Cargo.toml +++ b/matchbox_socket/Cargo.toml @@ -18,7 +18,7 @@ repository = "https://github.com/johanhelsing/matchbox" ggrs = ["dep:bincode", "dep:ggrs"] [dependencies] -matchbox_protocol = { path = "../matchbox_protocol", default-features = false } +matchbox_protocol = { version = "0.7", path = "../matchbox_protocol", default-features = false } futures-channel = { version = "0.3", default-features = false, features = [ "sink", ] } From dcd3cfb932e48b271d89bd61b46d6633a09358e7 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Fri, 11 Aug 2023 11:28:08 +0200 Subject: [PATCH 5/5] Fix linting issues --- matchbox_server/Cargo.toml | 4 +++- matchbox_signaling/Cargo.toml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/matchbox_server/Cargo.toml b/matchbox_server/Cargo.toml index 2dd2400d..1c393eb4 100644 --- a/matchbox_server/Cargo.toml +++ b/matchbox_server/Cargo.toml @@ -18,7 +18,9 @@ readme = "../README.md" [dependencies] matchbox_signaling = { version = "0.7", path = "../matchbox_signaling" } -matchbox_protocol = { version = "0.7", path = "../matchbox_protocol", features = ["json"] } +matchbox_protocol = { version = "0.7", path = "../matchbox_protocol", features = [ + "json", +] } async-trait = "0.1" axum = { version = "0.6", features = ["ws"] } tracing = { version = "0.1", features = ["log"] } diff --git a/matchbox_signaling/Cargo.toml b/matchbox_signaling/Cargo.toml index 341ba58f..d9de1262 100644 --- a/matchbox_signaling/Cargo.toml +++ b/matchbox_signaling/Cargo.toml @@ -18,7 +18,9 @@ categories = [ repository = "https://github.com/johanhelsing/matchbox" [dependencies] -matchbox_protocol = { version = "0.7", path = "../matchbox_protocol", features = ["json"] } +matchbox_protocol = { version = "0.7", path = "../matchbox_protocol", features = [ + "json", +] } axum = { version = "0.6", features = ["ws"] } hyper = { version = "0.14", features = ["server"] } tracing = { version = "0.1", features = ["log"] }