Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into remove-template-task
Browse files Browse the repository at this point in the history
  • Loading branch information
@wiktorsikora
wiktorsikora committed Aug 18, 2020
2 parents 85d7407 + 2445990 commit cc8d661
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 309 deletions.
326 changes: 57 additions & 269 deletions Cargo.lock
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions op-cli/Cargo.toml
View file
Expand Up @@ -10,23 +10,23 @@ build = "build.rs"
[dependencies]
tracing="0.1"
kg-diag = "0.4.0"
kg-tree = "0.2.0"
kg-tree = "0.2.1"
kg-utils = "0.4.0"
op-engine = { path= "../op-engine"}
op-core = { path = "../op-core" }
op-exec = { path = "../op-exec" }
op-rev = { path = "../op-rev" }
op-log = { path = "../op-log" }
structopt = "0.3.15"
structopt = "0.3.16"
futures = "0.3.5"
serde = "1.0.114"
serde_derive = "1.0.114"
serde_json = "1.0.56"
serde = "1.0.115"
serde_derive = "1.0.115"
serde_json = "1.0.57"
serde_yaml = "0.8.13"
toml = "0.5.6"
uuid = { version = "0.8.1", features = ["serde"] }
url = "2.1.1"
chrono = "0.4.13"
chrono = "0.4.15"
tokio = "0.2.22"

[features]
Expand All @@ -35,7 +35,7 @@ system-tests =[]
[dev-dependencies]
op-test-helpers = { version = "*", path = "../op-test-helpers" }
pretty_assertions = "0.6.1"
console = "0.11.3"
console = "0.12.0"

[[bin]]
name = "op"
Expand Down
14 changes: 7 additions & 7 deletions op-core/Cargo.toml
View file
Expand Up @@ -5,7 +5,7 @@ authors = ["Wiktor Sikora <wiktor.sikora@kodegenix.pl>"]
edition = "2018"

[dependencies]
kg-tree = "0.2.0"
kg-tree = "0.2.1"
kg-diag = "0.4.0"
kg-diag-derive = "0.4.0"
kg-display-derive = "0.1.1"
Expand All @@ -20,13 +20,13 @@ op-rev = { path = "../op-rev" }
futures = { version = "0.3.5", features = ["async-await"] }
tokio = { version = "0.2.22", features = ["full"] }
lazy_static = "1.4.0"
serde = "1.0.114"
async-trait = "0.1.36"
serde = "1.0.115"
async-trait = "0.1.38"
shared_child = "0.3.4"
serde_derive = "1.0.114"
serde_json = "1.0.56"
serde_derive = "1.0.115"
serde_json = "1.0.57"
serde_yaml = "0.8.13"
toml = "0.5.6"
libc = "0.2.73"
libc = "0.2.74"
regex = "1.3.9"
chrono = "0.4.13"
chrono = "0.4.15"
6 changes: 3 additions & 3 deletions op-engine/Cargo.toml
View file
Expand Up @@ -12,8 +12,8 @@ kg-diag-derive = "0.4.0"
kg-display-derive = "0.1.1"
futures = "0.3.5"
tokio = { version = "0.2.22", features = ["full"] }
async-trait = "0.1.36"
async-trait = "0.1.38"
uuid = { version = "0.8.1", features = ["v1", "v3", "v4", "v5", "serde"] }
serde = "1.0.114"
serde_derive = "1.0.114"
serde = "1.0.115"
serde_derive = "1.0.115"
rand = "0.7.3"
18 changes: 9 additions & 9 deletions op-exec/Cargo.toml
View file
Expand Up @@ -10,26 +10,26 @@ kg-diag = "0.4.0"
kg-diag-derive = "0.4.0"
kg-display-derive = "0.1.1"
kg-utils = "0.4.0"
kg-tree = "0.2.0"
kg-tree = "0.2.1"
kg-template = "0.1.2"
kg-symbol= "0.1.10"
kg-symbol= "0.2.0"
kg-lang = "0.1.1"
op-model = { path = "../op-model" }
op-rev = { path = "../op-rev" }
op-log = { path = "../op-log" }
tokio = { version = "0.2.22", features = ["full"] }
pin-project = "0.4.22"
pin-project = "0.4.23"
futures = { version = "0.3.5", features = ["async-await"] }
os_pipe = "0.9.2"
time = "0.2.16"
chrono = { version = "0.4.13", features = ["serde"] }
serde = "1.0.114"
serde_derive = "1.0.114"
serde_json = "1.0.56"
chrono = { version = "0.4.15", features = ["serde"] }
serde = "1.0.115"
serde_derive = "1.0.115"
serde_json = "1.0.57"
serde_yaml = "0.8.13"
toml = "0.5.6"
rmp-serde = "0.14.3"
libc = "0.2.73"
rmp-serde = "0.14.4"
libc = "0.2.74"
regex = "1.3.9"
uuid = { version = "0.8.1", features = ["v1", "v3", "v4", "v5", "serde"] }
bytes = "0.5.6"
Expand Down
14 changes: 7 additions & 7 deletions op-model/Cargo.toml
View file
Expand Up @@ -8,26 +8,26 @@ edition = "2018"
[dependencies]
kg-diag = "0.4.0"
kg-utils = "0.4.0"
kg-tree = "0.2.0"
kg-symbol = "0.1.10"
kg-tree = "0.2.1"
kg-symbol = "0.2.0"
kg-display = "0.1.2"
kg-display-derive = "0.1.1"
kg-diag-derive = "0.4.0"
op-rev = { path = "../op-rev" }
tracing="0.1.17"
libc = "0.2.73"
libc = "0.2.74"
walkdir = "2.3.1"
globset = "0.4.5"
serde = "1.0.114"
serde_derive = "1.0.114"
serde_json = "1.0.56"
serde = "1.0.115"
serde_derive = "1.0.115"
serde_json = "1.0.57"
serde_yaml = "0.8.13"
toml = "0.5.6"
heapsize = "0.4.2"
parking_lot = "0.11.0"

[dev-dependencies]
indoc = "0.3.6"
indoc = "1.0.2"
difference = "2.0.0"
tempfile = "3.1.0"
pretty_assertions = "0.6.1"
Expand Down
12 changes: 6 additions & 6 deletions op-rev/Cargo.toml
View file
Expand Up @@ -7,17 +7,17 @@ edition = "2018"

[dependencies]
kg-diag = "0.4.0"
kg-tree = "0.2.0"
kg-tree = "0.2.1"
kg-display = "0.1.2"
kg-display-derive = "0.1.1"
kg-diag-derive = "0.4.0"
git2 = "0.13.8"
serde = "1.0.114"
serde_derive = "1.0.114"
async-trait = "0.1.36"
serde = "1.0.115"
serde_derive = "1.0.115"
async-trait = "0.1.38"
tokio = {version="0.2.22", features=["full"]}

[dev-dependencies]
indoc = "0.3.6"
serde_json = "1.0.56"
indoc = "1.0.2"
serde_json = "1.0.57"
serde_yaml = "0.8.13"
2 changes: 1 addition & 1 deletion op-test-helpers/Cargo.toml
View file
Expand Up @@ -8,6 +8,6 @@ edition = "2018"

[dependencies]
tempfile = "3.1.0"
kg-tree = "0.2.0"
kg-tree = "0.2.1"
copy_dir = "0.1.2"
git2 = "0.13.8"

0 comments on commit cc8d661

Please sign in to comment.