From 66f8038b6b353c93fc5fd600548c0bbf3f24bcfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 14 Jul 2016 19:32:15 +0200 Subject: [PATCH] Updating UI --- Cargo.lock | 38 +++++++++++++++++++------------------- dapps/Cargo.toml | 8 ++++---- scripts/cov.sh | 2 +- scripts/doc.sh | 2 +- scripts/targets.sh | 14 +++++++------- signer/Cargo.toml | 2 +- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f7e9a95dd..ad1eba3a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -278,10 +278,10 @@ dependencies = [ "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-ui.git)", - "parity-dapps-home 0.5.2 (git+https://github.com/ethcore/parity-ui.git)", - "parity-dapps-status 0.5.1 (git+https://github.com/ethcore/parity-ui.git)", - "parity-dapps-wallet 0.6.1 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps-home 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps-status 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps-wallet 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde_codegen 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -376,7 +376,7 @@ dependencies = [ "ethcore-util 1.3.0", "jsonrpc-core 2.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-dapps-signer 0.2.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps-signer 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "ws 0.5.0 (git+https://github.com/ethcore/ws-rs.git?branch=stable)", @@ -871,8 +871,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "parity-dapps" -version = "0.3.0" -source = "git+https://github.com/ethcore/parity-ui.git#f16a7e8b7f1ea4fe4da12af22f36a745a07513d6" +version = "0.6.0" +source = "git+https://github.com/ethcore/parity-ui.git#7cf424e7a28a76957afd232221fb7395f8565d34" dependencies = [ "aster 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -885,34 +885,34 @@ dependencies = [ [[package]] name = "parity-dapps-home" -version = "0.5.2" -source = "git+https://github.com/ethcore/parity-ui.git#f16a7e8b7f1ea4fe4da12af22f36a745a07513d6" +version = "0.6.0" +source = "git+https://github.com/ethcore/parity-ui.git#7cf424e7a28a76957afd232221fb7395f8565d34" dependencies = [ - "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] [[package]] name = "parity-dapps-signer" -version = "0.2.0" -source = "git+https://github.com/ethcore/parity-ui.git#f16a7e8b7f1ea4fe4da12af22f36a745a07513d6" +version = "0.6.0" +source = "git+https://github.com/ethcore/parity-ui.git#7cf424e7a28a76957afd232221fb7395f8565d34" dependencies = [ - "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] [[package]] name = "parity-dapps-status" -version = "0.5.1" -source = "git+https://github.com/ethcore/parity-ui.git#f16a7e8b7f1ea4fe4da12af22f36a745a07513d6" +version = "0.6.0" +source = "git+https://github.com/ethcore/parity-ui.git#7cf424e7a28a76957afd232221fb7395f8565d34" dependencies = [ - "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] [[package]] name = "parity-dapps-wallet" -version = "0.6.1" -source = "git+https://github.com/ethcore/parity-ui.git#f16a7e8b7f1ea4fe4da12af22f36a745a07513d6" +version = "0.6.0" +source = "git+https://github.com/ethcore/parity-ui.git#7cf424e7a28a76957afd232221fb7395f8565d34" dependencies = [ - "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] [[package]] diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml index e3fc61af8..c4726394b 100644 --- a/dapps/Cargo.toml +++ b/dapps/Cargo.toml @@ -21,11 +21,11 @@ serde_json = "0.7.0" serde_macros = { version = "0.7.0", optional = true } ethcore-rpc = { path = "../rpc" } ethcore-util = { path = "../util" } -parity-dapps = { git = "https://github.com/ethcore/parity-ui.git", version = "0.3" } +parity-dapps = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6" } # List of apps -parity-dapps-status = { git = "https://github.com/ethcore/parity-ui.git", version = "0.5.1" } -parity-dapps-home = { git = "https://github.com/ethcore/parity-ui.git", version = "0.5.2" } -parity-dapps-wallet = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6.0", optional = true } +parity-dapps-status = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6" } +parity-dapps-home = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6" } +parity-dapps-wallet = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6", optional = true } mime_guess = { version = "1.6.1" } clippy = { version = "0.0.79", optional = true} diff --git a/scripts/cov.sh b/scripts/cov.sh index 1a189e2ea..49ef97c09 100755 --- a/scripts/cov.sh +++ b/scripts/cov.sh @@ -21,7 +21,7 @@ if ! type $KCOV > /dev/null; then fi . ./scripts/targets.sh -cargo test $TARGETS --no-default-features --no-run || exit $? +cargo test $TARGETS --no-run || exit $? diff --git a/scripts/doc.sh b/scripts/doc.sh index 3ab3d975c..657f47567 100755 --- a/scripts/doc.sh +++ b/scripts/doc.sh @@ -3,5 +3,5 @@ . ./scripts/targets.sh -cargo doc --no-deps --verbose --no-default-features $TARGETS && +cargo doc --no-deps --verbose $TARGETS && echo '' > target/doc/index.html diff --git a/scripts/targets.sh b/scripts/targets.sh index e159fbfdf..ee743f840 100644 --- a/scripts/targets.sh +++ b/scripts/targets.sh @@ -1,14 +1,14 @@ #!/bin/bash export TARGETS=" - -p ethkey \ - -p ethstore \ + -p bigint\ -p ethash \ - -p ethcore-util \ -p ethcore \ - -p ethsync \ + -p ethcore-dapps \ -p ethcore-rpc \ -p ethcore-signer \ - -p parity \ - -p bigint" -# TODO [ToDr] add ethcore-dapps back + -p ethcore-util \ + -p ethkey \ + -p ethstore \ + -p ethsync \ + -p parity" diff --git a/signer/Cargo.toml b/signer/Cargo.toml index f2a7af58a..d33b9da88 100644 --- a/signer/Cargo.toml +++ b/signer/Cargo.toml @@ -18,7 +18,7 @@ env_logger = "0.3" ws = { git = "https://github.com/ethcore/ws-rs.git", branch = "stable" } ethcore-util = { path = "../util" } ethcore-rpc = { path = "../rpc" } -parity-dapps-signer = { git = "https://github.com/ethcore/parity-ui.git", version = "0.2.0", optional = true} +parity-dapps-signer = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6", optional = true} clippy = { version = "0.0.79", optional = true}