chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enable tls by default, update deps

Browse Source
This commit is contained in:
Jonas Platte 2019-07-26 01:40:24 +02:00
parent a71b286dcd
commit b2cb9a67b3
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Cargo.toml
View File

@ -15,27 +15,22 @@ version = "0.2.0"
[dependencies] [dependencies]
futures-preview = "0.3.0-alpha.17" futures-preview = "0.3.0-alpha.17"
http = "0.1.17" http = "0.1.17"
ruma-api = { git = "https://github.com/ruma/ruma-api", branch = "endpoint_is_request" } hyper = { git = "https://github.com/hyperium/hyper" }
ruma-identifiers = "0.13.1" ruma-api = { git = "https://github.com/ruma/ruma-api" }
ruma-client-api = { git = "https://github.com/ruma/ruma-client-api", branch = "update-deps" }
ruma-identifiers = "0.14.0"
serde_json = "1.0.39" serde_json = "1.0.39"
serde_urlencoded = "0.5.4" serde_urlencoded = "0.5.4"
url = "1.7.2" url = "1.7.2"
[dependencies.hyper]
git = "https://github.com/hyperium/hyper"
[dependencies.hyper-tls] [dependencies.hyper-tls]
optional = true optional = true
version = "0.3.2" git = "https://github.com/hyperium/hyper-tls"
[dependencies.native-tls] [dependencies.native-tls]
optional = true optional = true
version = "0.2.2" version = "0.2.2"
[dependencies.ruma-client-api]
git = "https://github.com/ruma/ruma-client-api"
branch = "endpoint_is_request"
[dependencies.ruma-events] [dependencies.ruma-events]
git = "https://github.com/ruma/ruma-events" git = "https://github.com/ruma/ruma-events"
rev = "1b0be0d0e7fa1040fc51b748256b290e24677b19" rev = "1b0be0d0e7fa1040fc51b748256b290e24677b19"
@ -48,5 +43,5 @@ features = ["derive"]
git = "https://github.com/tokio-rs/tokio" git = "https://github.com/tokio-rs/tokio"
[features] [features]
default = [] default = ["tls"]
tls = ["hyper-tls", "native-tls"] tls = ["hyper-tls", "native-tls"]