Merge pull request #42 from Dushistov/update-websock-deps

update to current master tokio-tungstenite

Author: Dushistov

Cargo.toml

@@ -3,7 +3,7 @@ members = ["couchbase-lite-core-sys", "couchbase-lite", "chat-demo"]
 
 [patch.'crates-io']
 http = { git = "https://github.com/Dushistov/http", rev = "3ad3b825edc3a0d9048a6af5ab524f2fc51bde30" }
-tungstenite = { git = "https://github.com/Dushistov/tungstenite-rs", rev = "de80b9bced480d407665e46001fc2d7a6874d71e" }
+tokio-tungstenite = { git = "https://github.com/snapview/tokio-tungstenite", rev = "dff4d7209b5f8c4299a2e2be9f46bd79217fda48" }
 couchbase-lite = { path = "couchbase-lite" }
 couchbase-lite-core-sys = { path = "couchbase-lite-core-sys" }
 cmake = { git = "https://github.com/Dushistov/cmake-rs", rev = "125fe65e123f9bd4ceaf91924b0a381d473f2d97" }

couchbase-lite/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [features]
 default = ["replication", "tls"]
-replication = ["tokio-tungstenite", "http", "tokio", "futures-util",  "tokio-tls"]
+replication = ["tokio-tungstenite", "http", "tokio", "futures-util",  "tokio-native-tls"]
 tls = ["tokio-tungstenite/tls"]
 
 [dependencies]
@@ -23,7 +23,7 @@ tokio-tungstenite = { version = "0.10.1", optional = true }
 http = { version = "0.2.1", optional = true }
 tokio = { version = "0.2", default-features = false, features = ["sync", "macros"], optional = true }
 futures-util = { version = "0.3.5", optional = true }
-tokio-tls = { version = "0.3.1", optional = true }
+tokio-native-tls = { version = "0.1", optional = true }
 
 [dev-dependencies]
 tempfile = "3.0"

couchbase-lite/src/repl_transport.rs

@@ -62,7 +62,7 @@ pub fn use_web_sockets(handle: Handle) {
 
 type WsWriter = futures_util::stream::SplitSink<
     tokio_tungstenite::WebSocketStream<
-        tokio_tungstenite::stream::Stream<TcpStream, tokio_tls::TlsStream<TcpStream>>,
+        tokio_tungstenite::stream::Stream<TcpStream, tokio_native_tls::TlsStream<TcpStream>>,
     >,
     Message,
 >;