Merge pull request #17 from Horusiath/update-v0.18

Update v0.18

Cargo.toml

@@ -13,15 +13,16 @@ readme = "./README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-yrs = "0.17"
-y-sync = { version = "0.4", features = ["net"] }
+yrs = "0.18.2"
 warp = "0.3"
 futures-util = { version = "0.3", features = ["sink"] }
-tokio = { version = "1.34", features = ["rt","net","sync","macros"] }
+tokio = { version = "1.34", features = ["rt", "net", "sync", "macros"] }
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
-log = "0.4"
+tracing = { version = "0.1", features = ["log"] }
+tokio-util = { version = "0.7.10", features = ["codec"] }
 
 [dev-dependencies]
-tokio-tungstenite = "0.20"
-tokio = { version = "1", features = ["full"] }
+tokio-tungstenite = "0.21"
+tokio = { version = "1", features = ["full"] }
+bytes = "1.6"

examples/code-mirror/main.rs

@@ -3,9 +3,9 @@ use std::sync::Arc;
 use tokio::sync::{Mutex, RwLock};
 use warp::ws::{WebSocket, Ws};
 use warp::{Filter, Rejection, Reply};
-use y_sync::awareness::Awareness;
-use y_sync::net::BroadcastGroup;
+use yrs::sync::Awareness;
 use yrs::{Doc, Text, Transact};
+use yrs_warp::broadcast::BroadcastGroup;
 use yrs_warp::ws::{WarpSink, WarpStream};
 use yrs_warp::AwarenessRef;