From 6b82b19fa45e7338a7dc19dc9dc28b5d98e04bc7 Mon Sep 17 00:00:00 2001 From: Ronald Holshausen Date: Sat, 20 Jan 2024 22:24:41 +1100 Subject: [PATCH] chore(FFI): Update all dependencies --- rust/Cargo.lock | 62 +++++++++++++++++++++++----------- rust/pact_ffi/Cargo.toml | 72 ++++++++++++++++++++-------------------- 2 files changed, 79 insertions(+), 55 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 696f2e9b6..de385d414 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1842,7 +1842,7 @@ dependencies = [ "expectest", "futures", "home", - "itertools 0.10.5", + "itertools 0.12.0", "lazy_static", "libc", "log", @@ -1863,7 +1863,7 @@ dependencies = [ "regex", "regex-syntax 0.6.29", "reqwest", - "rstest", + "rstest 0.18.2", "serde", "serde_json", "sxd-document", @@ -1874,7 +1874,7 @@ dependencies = [ "tokio-rustls", "tracing", "tracing-core", - "tracing-log 0.1.4", + "tracing-log", "tracing-subscriber", "uuid", "zeroize", @@ -1912,7 +1912,7 @@ dependencies = [ "quickcheck", "rand", "reqwest", - "rstest", + "rstest 0.17.0", "semver", "serde", "serde_json", @@ -2069,7 +2069,7 @@ dependencies = [ "regex", "regex-syntax 0.6.29", "reqwest", - "rstest", + "rstest 0.17.0", "semver", "serde", "serde_json", @@ -2145,7 +2145,7 @@ dependencies = [ "tokio", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", "tracing-subscriber", "trycmd", ] @@ -2580,6 +2580,12 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +[[package]] +name = "relative-path" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" + [[package]] name = "reqwest" version = "0.11.23" @@ -2645,7 +2651,19 @@ checksum = "de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962" dependencies = [ "futures", "futures-timer", - "rstest_macros", + "rstest_macros 0.17.0", + "rustc_version", +] + +[[package]] +name = "rstest" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros 0.18.2", "rustc_version", ] @@ -2663,6 +2681,23 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "rstest_macros" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" +dependencies = [ + "cfg-if", + "glob", + "proc-macro2 1.0.78", + "quote 1.0.35", + "regex", + "relative-path", + "rustc_version", + "syn 2.0.48", + "unicode-ident", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -3546,17 +3581,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -3584,7 +3608,7 @@ dependencies = [ "time", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] diff --git a/rust/pact_ffi/Cargo.toml b/rust/pact_ffi/Cargo.toml index fee4ecaad..3fdf85641 100644 --- a/rust/pact_ffi/Cargo.toml +++ b/rust/pact_ffi/Cargo.toml @@ -15,53 +15,53 @@ exclude = [ [dependencies] ansi_term = "0.12.1" -anyhow = "1.0.70" +anyhow = "1.0.75" +bytes = "1.5.0" +chrono = "0.4.31" +chrono-tz = "0.8.4" +clap = "2.34.0" +either = "1.9.0" +env_logger = "0.10.1" +futures = "0.3.29" +itertools = "0.12.0" +lazy_static = "1.4.0" +libc = "0.2.151" +log = "0.4.20" +maplit = "1.0.2" +multipart = { version = "0.18.0", default-features = false, features = ["client", "mock"] } +onig = { version = "6.4.0", default-features = false } pact_matching = { version = "~1.1.9", path = "../pact_matching" } -pact_models = "~1.1.17" pact_mock_server = { version = "~1.2.4", path = "../pact_mock_server" } +pact_models = "~1.1.17" +pact-plugin-driver = "~0.5.0" pact_verifier = { version = "~1.0.5", path = "../pact_verifier" } -libc = "0.2.141" -zeroize = "1.6.0" -thiserror = "1.0.40" -serde_json = "1.0.95" -serde = { version = "1.0.159", features = ["derive"] } -bytes = "1.4.0" -lazy_static = "1.4.0" -maplit = "1.0.2" +panic-message = "0.3.0" rand = "0.8.5" -chrono = "0.4.24" -chrono-tz = "0.8.1" -env_logger = "0.10.0" -itertools = "0.10.5" -onig = { version = "6.4.0", default-features = false } -uuid = { version = "1.3.0", features = ["v4"] } -multipart = { version = "0.18.0", default-features = false, features = ["client", "mock"] } rand_regex = "0.15.1" +regex = "1.10.2" regex-syntax = "0.6.29" -clap = "2.34.0" -regex = "1.7.3" -tokio = { version = "1.27.0", features = ["full"] } -tokio-rustls = "0.24.0" +serde = { version = "1.0.193", features = ["derive"] } +serde_json = "1.0.108" sxd-document = "0.3.2" -either = "1.8.1" -pact-plugin-driver = "~0.5.0" -log = "0.4.17" -tracing = "0.1.37" # This needs to be the same version across all the libs (i.e. plugin driver) -tracing-core = "0.1.30" # This needs to be the same version across all the pact libs (i.e. plugin driver) -tracing-subscriber = { version = "0.3.16", features = ["env-filter", "tracing-log"] } -tracing-log = "0.1.3" -panic-message = "0.3.0" -futures = "0.3.28" +thiserror = "1.0.51" +tokio = { version = "1.35.1", features = ["full"] } +tokio-rustls = "0.24.1" +tracing = "0.1.40" # This needs to be the same version across all the libs (i.e. plugin driver) +tracing-core = "0.1.32" # This needs to be the same version across all the pact libs (i.e. plugin driver) +tracing-log = "0.2.0" +tracing-subscriber = { version = "0.3.18", features = ["env-filter", "tracing-log"] } +uuid = { version = "1.6.1", features = ["v4"] } +zeroize = "1.7.0" [dev-dependencies] expectest = "0.12.0" -reqwest = { version = "0.11.16", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } +reqwest = { version = "0.11.23", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] } quickcheck = "1.0.3" -test-log = "0.2.11" -tempfile = "3.5.0" -home = "0.5.4" -pretty_assertions = "1.3.0" -rstest = "0.17.0" +test-log = "0.2.14" +tempfile = "3.8.1" +home = "0.5.9" +pretty_assertions = "1.4.0" +rstest = "0.18.2" [lib] crate-type = ["cdylib", "staticlib", "rlib"]