diff --git a/Cargo.lock b/Cargo.lock index 7912220299d..2624137c5d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -997,6 +997,9 @@ name = "faster-hex" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" +dependencies = [ + "serde", +] [[package]] name = "fastrand" diff --git a/Cargo.toml b/Cargo.toml index 5761539b3ca..49da0a91820 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -173,11 +173,11 @@ gix = { version = "^0.66.0", path = "gix", default-features = false } clap = { version = "4.1.1", features = ["derive", "cargo"] } clap_complete = "4.4.3" -prodash = { workspace = true, optional = true } +prodash = { version = "29.0.0", optional = true } is-terminal = { version = "0.4.0", optional = true } env_logger = { version = "0.10.0", default-features = false } crosstermion = { version = "0.14.0", optional = true, default-features = false } -futures-lite = { workspace = true, optional = true } +futures-lite = { version = "2.1.0", optional = true } # for 'tracing' tracing-forest = { version = "0.1.5", features = ["serde"], optional = true } @@ -303,13 +303,6 @@ members = [ ] [workspace.dependencies] -prodash = { version = "29.0.0", default-features = false } -futures-lite = { version = "2.1.0", default-features = false, features = ["std"] } -faster-hex = { version = "0.9.0", default-features = false } -reqwest = { version = "0.12.0", default-features = false, features = ["charset", "http2", "macos-system-configuration"] } # all but the 'default-tls' feature -curl = { version = "0.4" } -winnow = { version = "0.6.0", features = ["simd"] } -unicode-bom = "2.0.2" [package.metadata.docs.rs] diff --git a/gitoxide-core/Cargo.toml b/gitoxide-core/Cargo.toml index 9926ccec0b8..1c50b3530cb 100644 --- a/gitoxide-core/Cargo.toml +++ b/gitoxide-core/Cargo.toml @@ -62,7 +62,7 @@ tempfile = "3.1.0" # for async-client async-trait = { version = "0.1.51", optional = true } async-net = { version = "2.0", optional = true } -futures-lite = { workspace = true, optional = true } +futures-lite = { version = "2.1.0", optional = true } async-io = { version = "2.2", optional = true } futures-io = { version = "0.3.16", optional = true } blocking = { version = "1.0.2", optional = true } diff --git a/gix-actor/Cargo.toml b/gix-actor/Cargo.toml index bfd37985227..3255f7b74b9 100644 --- a/gix-actor/Cargo.toml +++ b/gix-actor/Cargo.toml @@ -25,7 +25,7 @@ bstr = { version = "1.3.0", default-features = false, features = [ "std", "unicode", ] } -winnow.workspace = true +winnow = { version = "0.6", features = ["simd"] } itoa = "1.0.1" serde = { version = "1.0.114", optional = true, default-features = false, features = [ "derive", diff --git a/gix-attributes/Cargo.toml b/gix-attributes/Cargo.toml index 98e955ce2eb..1df5217ef3d 100644 --- a/gix-attributes/Cargo.toml +++ b/gix-attributes/Cargo.toml @@ -25,7 +25,7 @@ gix-trace = { version = "^0.1.8", path = "../gix-trace" } bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] } smallvec = "1.10.0" kstring = "2.0.0" -unicode-bom.workspace = true +unicode-bom = { version = "2.0.3" } thiserror = "1.0.26" serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] } diff --git a/gix-config/Cargo.toml b/gix-config/Cargo.toml index e111a95f069..12cfa189d74 100644 --- a/gix-config/Cargo.toml +++ b/gix-config/Cargo.toml @@ -24,10 +24,10 @@ gix-sec = { version = "^0.10.8", path = "../gix-sec" } gix-ref = { version = "^0.47.0", path = "../gix-ref" } gix-glob = { version = "^0.16.5", path = "../gix-glob" } -winnow.workspace = true +winnow = { version = "0.6", features = ["simd"] } memchr = "2" thiserror = "1.0.26" -unicode-bom.workspace = true +unicode-bom = { version = "2.0.3" } bstr = { version = "1.3.0", default-features = false, features = ["std"] } serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] } smallvec = "1.9.0" diff --git a/gix-features/Cargo.toml b/gix-features/Cargo.toml index 2b0d532bdb2..9ca83966a08 100644 --- a/gix-features/Cargo.toml +++ b/gix-features/Cargo.toml @@ -136,7 +136,7 @@ crc32fast = { version = "1.2.1", optional = true } sha1 = { version = "0.10.0", optional = true } # progress -prodash = { workspace = true, optional = true } +prodash = { version = "29.0.0", optional = true } bytesize = { version = "1.0.1", optional = true } # pipe diff --git a/gix-hash/Cargo.toml b/gix-hash/Cargo.toml index 6faf9187060..ee6cc063d76 100644 --- a/gix-hash/Cargo.toml +++ b/gix-hash/Cargo.toml @@ -15,17 +15,17 @@ test = false [features] ## Data structures implement `serde::Serialize` and `serde::Deserialize`. -serde= ["dep:serde"] +serde = ["dep:serde"] [dependencies] thiserror = "1.0.33" -faster-hex = { workspace = true } +faster-hex = { version = "0.9.0" } serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] } document-features = { version = "0.2.0", optional = true } [dev-dependencies] -gix-testtools = { path = "../tests/tools"} +gix-testtools = { path = "../tests/tools" } gix-features = { path = "../gix-features", features = ["rustsha1"] } [package.metadata.docs.rs] diff --git a/gix-ignore/Cargo.toml b/gix-ignore/Cargo.toml index 7b473bbee88..172dc8c558d 100644 --- a/gix-ignore/Cargo.toml +++ b/gix-ignore/Cargo.toml @@ -22,7 +22,7 @@ gix-path = { version = "^0.10.10", path = "../gix-path" } gix-trace = { version = "^0.1.8", path = "../gix-trace" } bstr = { version = "1.3.0", default-features = false, features = ["std", "unicode"] } -unicode-bom.workspace = true +unicode-bom = { version = "2.0.3" } serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] } document-features = { version = "0.2.1", optional = true } diff --git a/gix-object/Cargo.toml b/gix-object/Cargo.toml index 8f61011847c..a5afd8375f1 100644 --- a/gix-object/Cargo.toml +++ b/gix-object/Cargo.toml @@ -50,7 +50,7 @@ bstr = { version = "1.3.0", default-features = false, features = [ "std", "unicode", ] } -winnow.workspace = true +winnow = { version = "0.6", features = ["simd"] } smallvec = { version = "1.4.0", features = ["write"] } serde = { version = "1.0.114", optional = true, default-features = false, features = [ "derive", diff --git a/gix-packetline-blocking/Cargo.toml b/gix-packetline-blocking/Cargo.toml index 4cedd11e7d3..fa1a22922dc 100644 --- a/gix-packetline-blocking/Cargo.toml +++ b/gix-packetline-blocking/Cargo.toml @@ -29,9 +29,9 @@ serde = ["dep:serde", "bstr/serde"] [dependencies] gix-trace = { version = "^0.1.9", path = "../gix-trace" } -serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"]} +serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"] } thiserror = "1.0.34" -faster-hex = { workspace = true } +faster-hex = { version = "0.9.0" } bstr = { version = "1.3.0", default-features = false, features = ["std"] } document-features = { version = "0.2.0", optional = true } diff --git a/gix-packetline/Cargo.toml b/gix-packetline/Cargo.toml index eb4f3bf7c2a..8c4432c00b9 100644 --- a/gix-packetline/Cargo.toml +++ b/gix-packetline/Cargo.toml @@ -41,13 +41,13 @@ required-features = ["blocking-io", "maybe-async/is_sync"] [dependencies] gix-trace = { version = "^0.1.8", path = "../gix-trace" } -serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"]} +serde = { version = "1.0.114", optional = true, default-features = false, features = ["std", "derive"] } thiserror = "1.0.34" -faster-hex = { workspace = true } +faster-hex = { version = "0.9.0" } bstr = { version = "1.3.0", default-features = false, features = ["std"] } # async support futures-io = { version = "0.3.16", optional = true } -futures-lite = { workspace = true, optional = true } +futures-lite = { version = "2.1.0", optional = true } pin-project-lite = { version = "0.2.6", optional = true } document-features = { version = "0.2.0", optional = true } diff --git a/gix-protocol/Cargo.toml b/gix-protocol/Cargo.toml index 08984a772df..dada295809b 100644 --- a/gix-protocol/Cargo.toml +++ b/gix-protocol/Cargo.toml @@ -62,12 +62,12 @@ bstr = { version = "1.3.0", default-features = false, features = [ "std", "unicode", ] } -winnow.workspace = true +winnow = { version = "0.6", features = ["simd"] } # for async-client async-trait = { version = "0.1.51", optional = true } futures-io = { version = "0.3.16", optional = true } -futures-lite = { workspace = true, optional = true } +futures-lite = { version = "2.1.0", optional = true } maybe-async = "0.2.6" document-features = { version = "0.2.0", optional = true } diff --git a/gix-ref/Cargo.toml b/gix-ref/Cargo.toml index 1d4dee06269..d446ddb96e6 100644 --- a/gix-ref/Cargo.toml +++ b/gix-ref/Cargo.toml @@ -31,7 +31,7 @@ gix-lock = { version = "^14.0.0", path = "../gix-lock" } gix-tempfile = { version = "^14.0.0", default-features = false, path = "../gix-tempfile" } thiserror = "1.0.34" -winnow.workspace = true +winnow = { version = "0.6", features = ["simd"] } serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] } # packed refs diff --git a/gix-transport/Cargo.toml b/gix-transport/Cargo.toml index 7d43a722c2e..7e53c15cdda 100644 --- a/gix-transport/Cargo.toml +++ b/gix-transport/Cargo.toml @@ -98,17 +98,18 @@ thiserror = "1.0.26" # for async-client async-trait = { version = "0.1.51", optional = true } futures-io = { version = "0.3.16", optional = true } -futures-lite = { workspace = true, optional = true } +futures-lite = { version = "2.1.0", optional = true } pin-project-lite = { version = "0.2.6", optional = true } # for http-client base64 = { version = "0.22.1", optional = true } # for http-client-curl. Additional configuration should be performed on higher levels of the dependency tree. -curl = { workspace = true, optional = true } +curl = { version = "0.4", optional = true } # for http-client-reqwest -reqwest = { workspace = true, optional = true, features = ["blocking"] } +# all but the 'default-tls' feature +reqwest = { version = "0.12.0", optional = true, default-features = false, features = ["blocking", "charset", "http2", "macos-system-configuration"] } ## If used in conjunction with `async-client`, the `connect()` method will become available along with supporting the git protocol over TCP, ## where the TCP stream is created using this crate. diff --git a/gix/Cargo.toml b/gix/Cargo.toml index b0e5305e243..ab05511ef09 100644 --- a/gix/Cargo.toml +++ b/gix/Cargo.toml @@ -358,7 +358,7 @@ gix-protocol = { version = "^0.45.3", path = "../gix-protocol", optional = true gix-transport = { version = "^0.42.3", path = "../gix-transport", optional = true } # Just to get the progress-tree feature -prodash = { workspace = true, optional = true, features = ["progress-tree"] } +prodash = { version = "29.0.0", optional = true, features = ["progress-tree"] } once_cell = "1.14.0" signal-hook = { version = "0.3.9", default-features = false, optional = true } thiserror = "1.0.26"