summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock60
-rw-r--r--mullvad-daemon/Cargo.toml8
-rw-r--r--talpid-core/Cargo.toml4
-rw-r--r--talpid-ipc/Cargo.toml6
4 files changed, 39 insertions, 39 deletions
diff --git a/Cargo.lock b/Cargo.lock
index b7e931c7bb..a1d5e77fc3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -461,8 +461,8 @@ dependencies = [
[[package]]
name = "jsonrpc-core"
-version = "7.0.1"
-source = "git+https://github.com/paritytech/jsonrpc#91cb1a97c836d710ece2f1e3ae7fbab321cfc6f7"
+version = "7.1.0"
+source = "git+https://github.com/paritytech/jsonrpc?tag=v7.1.0#a51a5265d85488c76a6ce8807d42d7dd25e94f1b"
dependencies = [
"futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -485,32 +485,32 @@ dependencies = [
[[package]]
name = "jsonrpc-macros"
-version = "7.0.1"
-source = "git+https://github.com/paritytech/jsonrpc#91cb1a97c836d710ece2f1e3ae7fbab321cfc6f7"
+version = "7.1.0"
+source = "git+https://github.com/paritytech/jsonrpc?tag=v7.1.0#a51a5265d85488c76a6ce8807d42d7dd25e94f1b"
dependencies = [
- "jsonrpc-core 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
- "jsonrpc-pubsub 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
+ "jsonrpc-core 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
+ "jsonrpc-pubsub 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
"serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "jsonrpc-pubsub"
-version = "7.0.1"
-source = "git+https://github.com/paritytech/jsonrpc#91cb1a97c836d710ece2f1e3ae7fbab321cfc6f7"
+version = "7.1.0"
+source = "git+https://github.com/paritytech/jsonrpc?tag=v7.1.0#a51a5265d85488c76a6ce8807d42d7dd25e94f1b"
dependencies = [
- "jsonrpc-core 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
+ "jsonrpc-core 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "jsonrpc-server-utils"
-version = "7.0.1"
-source = "git+https://github.com/paritytech/jsonrpc#91cb1a97c836d710ece2f1e3ae7fbab321cfc6f7"
+version = "7.1.0"
+source = "git+https://github.com/paritytech/jsonrpc?tag=v7.1.0#a51a5265d85488c76a6ce8807d42d7dd25e94f1b"
dependencies = [
"bytes 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"globset 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
+ "jsonrpc-core 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-core 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio-io 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -518,11 +518,11 @@ dependencies = [
[[package]]
name = "jsonrpc-ws-server"
-version = "7.0.1"
-source = "git+https://github.com/paritytech/jsonrpc#91cb1a97c836d710ece2f1e3ae7fbab321cfc6f7"
+version = "7.1.0"
+source = "git+https://github.com/paritytech/jsonrpc?tag=v7.1.0#a51a5265d85488c76a6ce8807d42d7dd25e94f1b"
dependencies = [
- "jsonrpc-core 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
- "jsonrpc-server-utils 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
+ "jsonrpc-core 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
+ "jsonrpc-server-utils 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -667,10 +667,10 @@ dependencies = [
"futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-client-core 0.1.0 (git+https://github.com/mullvad/jsonrpc-client-rs?branch=rewrite-to-async)",
"jsonrpc-client-http 0.1.0 (git+https://github.com/mullvad/jsonrpc-client-rs?branch=rewrite-to-async)",
- "jsonrpc-core 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
- "jsonrpc-macros 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
- "jsonrpc-pubsub 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
- "jsonrpc-ws-server 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
+ "jsonrpc-core 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
+ "jsonrpc-macros 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
+ "jsonrpc-pubsub 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
+ "jsonrpc-ws-server 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"mullvad-types 0.1.0",
@@ -1182,8 +1182,8 @@ dependencies = [
"assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"duct 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
- "jsonrpc-macros 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
+ "jsonrpc-core 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
+ "jsonrpc-macros 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1200,9 +1200,9 @@ dependencies = [
"assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
- "jsonrpc-macros 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
- "jsonrpc-ws-server 7.0.1 (git+https://github.com/paritytech/jsonrpc)",
+ "jsonrpc-core 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
+ "jsonrpc-macros 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
+ "jsonrpc-ws-server 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1528,12 +1528,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c"
"checksum jsonrpc-client-core 0.1.0 (git+https://github.com/mullvad/jsonrpc-client-rs?branch=rewrite-to-async)" = "<none>"
"checksum jsonrpc-client-http 0.1.0 (git+https://github.com/mullvad/jsonrpc-client-rs?branch=rewrite-to-async)" = "<none>"
-"checksum jsonrpc-core 7.0.1 (git+https://github.com/paritytech/jsonrpc)" = "<none>"
+"checksum jsonrpc-core 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)" = "<none>"
"checksum jsonrpc-core 7.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "903e5eee845f3d83c1436d12848d97b1247cf850ff06a8e1db2f1ce3543af2cf"
-"checksum jsonrpc-macros 7.0.1 (git+https://github.com/paritytech/jsonrpc)" = "<none>"
-"checksum jsonrpc-pubsub 7.0.1 (git+https://github.com/paritytech/jsonrpc)" = "<none>"
-"checksum jsonrpc-server-utils 7.0.1 (git+https://github.com/paritytech/jsonrpc)" = "<none>"
-"checksum jsonrpc-ws-server 7.0.1 (git+https://github.com/paritytech/jsonrpc)" = "<none>"
+"checksum jsonrpc-macros 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)" = "<none>"
+"checksum jsonrpc-pubsub 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)" = "<none>"
+"checksum jsonrpc-server-utils 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)" = "<none>"
+"checksum jsonrpc-ws-server 7.1.0 (git+https://github.com/paritytech/jsonrpc?tag=v7.1.0)" = "<none>"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
"checksum lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "cf186d1a8aa5f5bee5fd662bc9c1b949e0259e1bcc379d1f006847b0080c7417"
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index a7a20af859..2c132d6c20 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -18,10 +18,10 @@ futures = "0.1"
serde = "1.0"
serde_derive = "1.0"
log = "0.3"
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc" }
-jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc" }
-jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc" }
-jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.0" }
+jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.0" }
+jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.0" }
+jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.0" }
jsonrpc-client-core = { git = "https://github.com/mullvad/jsonrpc-client-rs", branch = "rewrite-to-async" }
jsonrpc-client-http = { git = "https://github.com/mullvad/jsonrpc-client-rs", branch = "rewrite-to-async" }
uuid = { version = "0.5", features = ["v4"] }
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 72c94c0a3e..0d987cca90 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -7,8 +7,8 @@ description = "Core backend functionality of the Mullvad VPN client"
[dependencies]
duct = "0.9.1"
error-chain = "0.10"
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc" }
-jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.0" }
+jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.0" }
lazy_static = "0.2"
log = "0.3"
mktemp = "0.3"
diff --git a/talpid-ipc/Cargo.toml b/talpid-ipc/Cargo.toml
index 45adefa6a7..8f354bc946 100644
--- a/talpid-ipc/Cargo.toml
+++ b/talpid-ipc/Cargo.toml
@@ -9,12 +9,12 @@ error-chain = "0.10"
serde = "1.0"
serde_json = "1.0"
log = "0.3"
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc" }
-jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.0" }
+jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.0" }
ws = { git = "https://github.com/tomusdrw/ws-rs" }
url = "1.4"
[dev-dependencies]
assert_matches = "1.0"
env_logger = "0.4"
-jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc" }
+jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.0" }