Merge pull request #1216 from ethcore/serde-bump

Bumping serde & syntex
This commit is contained in:
Marek Kotewicz
2016-06-06 11:32:13 +02:00
12 changed files with 85 additions and 93 deletions

View File

@@ -13,7 +13,7 @@ log = "0.3"
serde = "0.7.0"
serde_json = "0.7.0"
jsonrpc-core = "2.0"
jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git", branch = "multiple_cors_domains" }
jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" }
ethcore-util = { path = "../util" }
ethcore = { path = "../ethcore" }
ethash = { path = "../ethash" }
@@ -28,7 +28,7 @@ json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" }
[build-dependencies]
serde_codegen = { version = "0.7.0", optional = true }
syntex = "^0.32.0"
syntex = "*"
[features]
default = ["serde_codegen"]