Skip to content

Commit 369cf1b

Browse files
committedMar 21, 2024
Make reqwest a workspace package
That way we assure that the version will always be the correct one within the workspace, which is required for proper function.
1 parent cdb128c commit 369cf1b

File tree

4 files changed

+147
-216
lines changed

4 files changed

+147
-216
lines changed
 

‎Cargo.lock

+141-211
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ members = [
304304
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 }
307+
reqwest = { version = "0.12.0", default-features = false, features = ["charset", "http2", "macos-system-configuration"] } # all but the 'default-tls' feature
307308

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

‎gix-transport/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ base64 = { version = "0.21.0", optional = true }
7878
curl = { version = "0.4", optional = true }
7979

8080
# for http-client-reqwest
81-
reqwest = { version = "0.12.0", optional = true, default-features = false, features = ["blocking"] }
81+
reqwest = { workspace = true, optional = true, features = ["blocking"] }
8282

8383
## If used in conjunction with `async-client`, the `connect()` method will become available along with supporting the git protocol over TCP,
8484
## where the TCP stream is created using this crate.

‎gix/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ blocking-http-transport-curl-rustls = ["blocking-http-transport-curl", "dep:curl
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.
134-
blocking-http-transport-reqwest-rust-tls = ["blocking-http-transport-reqwest", "reqwest-for-configuration-only/rustls-tls"]
134+
blocking-http-transport-reqwest-rust-tls = ["blocking-http-transport-reqwest", "reqwest/rustls-tls"]
135135
## Stacks with `blocking-http-transport-reqwest` and enables `https://` via the `rustls` crate.
136136
## This also makes use of `trust-dns` to avoid `getaddrinfo`, but note it comes with its own problems.
137-
blocking-http-transport-reqwest-rust-tls-trust-dns = ["blocking-http-transport-reqwest", "reqwest-for-configuration-only/rustls-tls", "reqwest-for-configuration-only/trust-dns"]
137+
blocking-http-transport-reqwest-rust-tls-trust-dns = ["blocking-http-transport-reqwest", "reqwest/rustls-tls", "reqwest/trust-dns"]
138138
## Stacks with `blocking-http-transport-reqwest` and enables `https://` via the `native-tls` crate.
139-
blocking-http-transport-reqwest-native-tls = ["blocking-http-transport-reqwest", "reqwest-for-configuration-only/default-tls"]
139+
blocking-http-transport-reqwest-native-tls = ["blocking-http-transport-reqwest", "reqwest/default-tls"]
140140

141141

142142
#! #### Performance
@@ -315,7 +315,7 @@ curl-for-configuration-only = { package = "curl", version = "0.4", optional = tr
315315
regex = { version = "1.6.0", optional = true, default-features = false, features = ["std"] }
316316

317317
# For internal use to allow pure-Rust builds without openssl.
318-
reqwest-for-configuration-only = { package = "reqwest", version = "0.11.13", default-features = false, optional = true }
318+
reqwest = { workspace = true, optional = true }
319319

320320
# for `interrupt` module
321321
parking_lot = "0.12.1"

0 commit comments

Comments
 (0)
Please sign in to comment.