Skip to content

Commit

Permalink
Turncurl into a workspace package
Browse files Browse the repository at this point in the history
That way, versions can't diverge.
  • Loading branch information
Byron committed Mar 21, 2024
1 parent 3b8f39d commit adee500
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Expand Up @@ -305,6 +305,7 @@ prodash = { version = "28.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" }

[package.metadata.docs.rs]
features = ["document-features", "max"]
Expand Down
2 changes: 1 addition & 1 deletion gix-transport/Cargo.toml
Expand Up @@ -75,7 +75,7 @@ pin-project-lite = { version = "0.2.6", optional = true }
base64 = { version = "0.21.0", optional = true }

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

# for http-client-reqwest
reqwest = { workspace = true, optional = true, features = ["blocking"] }
Expand Down
6 changes: 3 additions & 3 deletions gix/Cargo.toml
Expand Up @@ -127,7 +127,7 @@ blocking-network-client = ["gix-protocol/blocking-client", "gix-pack/streaming-i
## 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.
blocking-http-transport-curl = ["blocking-network-client", "gix-transport/http-client-curl"]
## Stacks with `blocking-http-transport-curl` and also enables the `rustls` backend to avoid `openssl`.
blocking-http-transport-curl-rustls = ["blocking-http-transport-curl", "dep:curl-for-configuration-only", "curl-for-configuration-only?/rustls"]
blocking-http-transport-curl-rustls = ["blocking-http-transport-curl", "dep:curl", "curl?/rustls"]
## 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.
blocking-http-transport-reqwest = ["blocking-network-client", "gix-transport/http-client-reqwest"]
## Stacks with `blocking-http-transport-reqwest` and enables `https://` via the `rustls` crate.
Expand Down Expand Up @@ -305,8 +305,8 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
smallvec = "1.9.0"
async-std = { version = "1.12.0", optional = true }

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

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

0 comments on commit adee500

Please sign in to comment.