From 7ac1261893dc64a47c7d02301991d3da820c5139 Mon Sep 17 00:00:00 2001 From: John Smith Date: Sun, 3 Sep 2023 10:45:20 -0400 Subject: [PATCH] simplify dependencies --- Cargo.lock | 10 +++++----- Cargo.toml | 4 ++-- veilid-cli/Cargo.toml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f515d1b0..4e7d59ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1290,7 +1290,7 @@ dependencies = [ [[package]] name = "cursive" version = "0.20.0" -source = "git+https://gitlab.com/veilid/cursive.git?rev=631dad18f0b4b246914998e8952da8abb6093bd2#631dad18f0b4b246914998e8952da8abb6093bd2" +source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4" dependencies = [ "ahash 0.8.3", "async-std", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "cursive-flexi-logger-view" version = "0.5.0" -source = "git+https://gitlab.com/veilid/cursive-flexi-logger-view.git?rev=f623d81aeef45601c35223d064e4898aed3808ba#f623d81aeef45601c35223d064e4898aed3808ba" +source = "git+https://gitlab.com/veilid/cursive-flexi-logger-view.git#7c931536b8c57339011bbe2ee604e431c91c0aa8" dependencies = [ "arraydeque", "cursive_core", @@ -1324,7 +1324,7 @@ dependencies = [ [[package]] name = "cursive-macros" version = "0.1.0" -source = "git+https://gitlab.com/veilid/cursive.git?rev=631dad18f0b4b246914998e8952da8abb6093bd2#631dad18f0b4b246914998e8952da8abb6093bd2" +source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4" dependencies = [ "proc-macro2", "quote", @@ -1334,7 +1334,7 @@ dependencies = [ [[package]] name = "cursive_buffered_backend" version = "0.6.1" -source = "git+https://gitlab.com/veilid/cursive-buffered-backend.git?rev=dd6b0276050e041d8f194cf415da5e1481f91370#dd6b0276050e041d8f194cf415da5e1481f91370" +source = "git+https://gitlab.com/veilid/cursive-buffered-backend.git#a0f5242882b0d42a0b18baa68b2d8d6dcaa6dee4" dependencies = [ "cursive_core", "enumset", @@ -1347,7 +1347,7 @@ dependencies = [ [[package]] name = "cursive_core" version = "0.3.7" -source = "git+https://gitlab.com/veilid/cursive.git?rev=631dad18f0b4b246914998e8952da8abb6093bd2#631dad18f0b4b246914998e8952da8abb6093bd2" +source = "git+https://gitlab.com/veilid/cursive.git#a76fc9050f69edf56bc37efc63194050b9f222e4" dependencies = [ "ahash 0.8.3", "ansi-parser", diff --git a/Cargo.toml b/Cargo.toml index 128730ad..61d53ad7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,8 +10,8 @@ members = [ exclude = ["./external"] [patch.crates-io] -cursive = { version = "0.20.0", git = "https://gitlab.com/veilid/cursive.git", rev = "631dad18f0b4b246914998e8952da8abb6093bd2" } -cursive_core = { version = "0.3.7", git = "https://gitlab.com/veilid/cursive.git", rev = "631dad18f0b4b246914998e8952da8abb6093bd2" } +cursive = { git = "https://gitlab.com/veilid/cursive.git" } +cursive_core = { git = "https://gitlab.com/veilid/cursive.git" } [profile.release] opt-level = "s" diff --git a/veilid-cli/Cargo.toml b/veilid-cli/Cargo.toml index 598bc839..3f6d83f6 100644 --- a/veilid-cli/Cargo.toml +++ b/veilid-cli/Cargo.toml @@ -28,13 +28,13 @@ async-std = { version = "^1.9", features = [ tokio = { version = "^1", features = ["full"], optional = true } tokio-util = { version = "^0", features = ["compat"], optional = true } async-tungstenite = { version = "^0.8" } -cursive = { version = "0.20.0", git = "https://gitlab.com/veilid/cursive.git", rev = "631dad18f0b4b246914998e8952da8abb6093bd2", default-features = false, features = [ +cursive = { git = "https://gitlab.com/veilid/cursive.git", default-features = false, features = [ "crossterm", "toml", "ansi", ] } -cursive-flexi-logger-view = { version = "0.5.0", git = "https://gitlab.com/veilid/cursive-flexi-logger-view.git", rev = "f623d81aeef45601c35223d064e4898aed3808ba" } -cursive_buffered_backend = { version = "0.6.1", git = "https://gitlab.com/veilid/cursive-buffered-backend.git", rev = "dd6b0276050e041d8f194cf415da5e1481f91370" } +cursive-flexi-logger-view = { git = "https://gitlab.com/veilid/cursive-flexi-logger-view.git" } +cursive_buffered_backend = { git = "https://gitlab.com/veilid/cursive-buffered-backend.git" } # cursive-multiplex = "0.6.0" # cursive_tree_view = "0.6.0" cursive_table_view = "0.14.0"