Skip to content

Commit adee500

Browse files
committedMar 21, 2024··
Turncurl into a workspace package
That way, versions can't diverge.
1 parent 3b8f39d commit adee500

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed
 

‎Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ prodash = { version = "28.0.0", default-features = false }
305305
futures-lite = { version = "2.1.0", default-features = false, features = ["std"] }
306306
faster-hex = { version = "0.9.0", default-features = false }
307307
reqwest = { version = "0.12.0", default-features = false, features = ["charset", "http2", "macos-system-configuration"] } # all but the 'default-tls' feature
308+
curl = { version = "0.4" }
308309

309310
[package.metadata.docs.rs]
310311
features = ["document-features", "max"]

‎gix-transport/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pin-project-lite = { version = "0.2.6", optional = true }
7575
base64 = { version = "0.21.0", optional = true }
7676

7777
# for http-client-curl. Additional configuration should be performed on higher levels of the dependency tree.
78-
curl = { version = "0.4", optional = true }
78+
curl = { workspace = true, optional = true }
7979

8080
# for http-client-reqwest
8181
reqwest = { workspace = true, optional = true, features = ["blocking"] }

‎gix/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ blocking-network-client = ["gix-protocol/blocking-client", "gix-pack/streaming-i
127127
## Stacks with `blocking-network-client` to provide support for HTTP/S using **curl**, and implies blocking networking as a whole, making the `https://` transport available.
128128
blocking-http-transport-curl = ["blocking-network-client", "gix-transport/http-client-curl"]
129129
## Stacks with `blocking-http-transport-curl` and also enables the `rustls` backend to avoid `openssl`.
130-
blocking-http-transport-curl-rustls = ["blocking-http-transport-curl", "dep:curl-for-configuration-only", "curl-for-configuration-only?/rustls"]
130+
blocking-http-transport-curl-rustls = ["blocking-http-transport-curl", "dep:curl", "curl?/rustls"]
131131
## Stacks with `blocking-network-client` to provide support for HTTP/S using **reqwest**, and implies blocking networking as a whole, making the `https://` transport available.
132132
blocking-http-transport-reqwest = ["blocking-network-client", "gix-transport/http-client-reqwest"]
133133
## Stacks with `blocking-http-transport-reqwest` and enables `https://` via the `rustls` crate.
@@ -305,8 +305,8 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
305305
smallvec = "1.9.0"
306306
async-std = { version = "1.12.0", optional = true }
307307

308-
# Must match the one in `gix-transport`.
309-
curl-for-configuration-only = { package = "curl", version = "0.4", optional = true }
308+
# Used for feature-configuration only.
309+
curl = { workspace = true, optional = true }
310310

311311
## For use in rev-parse, which provides searching commits by running a regex on their message.
312312
##

0 commit comments

Comments
 (0)
Please sign in to comment.