Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Centralize reqwest configuration

Manav Rathi2caaf3261b78
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 575b15423b..0976b67451 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -3883,22 +3883,6 @@ dependencies = [
"webpki-roots",
]
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
-]
-
[[package]]
name = "hyper-util"
version = "0.1.20"
@@ -7269,12 +7253,10 @@ dependencies = [
"http-body-util",
"hyper",
"hyper-rustls",
- "hyper-tls",
"hyper-util",
"js-sys",
"log",
"mime",
- "native-tls",
"percent-encoding",
"pin-project-lite",
"quinn",
@@ -7286,7 +7268,6 @@ dependencies = [
"serde_urlencoded",
"sync_wrapper",
"tokio",
- "tokio-native-tls",
"tokio-rustls",
"tokio-util",
"tower",
@@ -9295,16 +9276,6 @@ dependencies = [
"syn 2.0.117",
]
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
[[package]]
name = "tokio-rustls"
version = "0.26.4"
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index fdac44a5a8..24f8d1bbc2 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -41,6 +41,7 @@ md-5 = "0.11.0"
mockito = "1.7.2"
ort = { version = "=2.0.0-rc.13", default-features = false }
ort-sys = { version = "=2.0.0-rc.13", default-features = false }
+reqwest = { version = "0.12.28", default-features = false }
serde = { version = "1.0.228", features = ["derive"] }
serde_json = "1.0.149"
sha2 = "0.11.0"
diff --git a/rust/crates/assets/Cargo.toml b/rust/crates/assets/Cargo.toml
index dcd955c4df..458ca9338e 100644
--- a/rust/crates/assets/Cargo.toml
+++ b/rust/crates/assets/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2024"
[dependencies]
flate2 = "1.1.9"
futures-util = "0.3.32"
-reqwest = { version = "0.12", default-features = false, features = ["http2", "charset", "system-proxy", "rustls-tls-webpki-roots"] }
+reqwest = { workspace = true, features = ["http2", "system-proxy", "rustls-tls-webpki-roots"] }
serde.workspace = true
serde_json.workspace = true
sha2.workspace = true
diff --git a/rust/crates/contacts/Cargo.toml b/rust/crates/contacts/Cargo.toml
index 135dc24eab..f0af16a915 100644
--- a/rust/crates/contacts/Cargo.toml
+++ b/rust/crates/contacts/Cargo.toml
@@ -19,7 +19,7 @@ uuid = { version = "1", features = ["v4", "js"] }
ente-test-support.workspace = true
hmac = "0.13"
mockito.workspace = true
-reqwest = { version = "0.12", features = ["json", "rustls-tls-native-roots"] }
+reqwest = { workspace = true, features = ["json"] }
sha1 = "0.11"
tokio = { version = "1", features = ["macros", "rt-multi-thread", "time"] }
zeroize.workspace = true
diff --git a/rust/crates/core/Cargo.toml b/rust/crates/core/Cargo.toml
index fe3b213fb1..54f22432b7 100644
--- a/rust/crates/core/Cargo.toml
+++ b/rust/crates/core/Cargo.toml
@@ -16,7 +16,7 @@ getrandom = { version = "0.2", features = ["js"] }
log = "0.4"
md-5.workspace = true
rand_core = { version = "0.6", features = ["getrandom"] }
-reqwest = { version = "0.12", default-features = false, features = ["http2", "charset", "system-proxy", "json", "rustls-tls-native-roots", "rustls-tls-webpki-roots"] }
+reqwest = { workspace = true, features = ["http2", "charset", "system-proxy", "json", "rustls-tls-native-roots", "rustls-tls-webpki-roots"] }
salsa20 = "0.10"
serde.workspace = true
serde_json.workspace = true
@@ -27,7 +27,7 @@ xsalsa20poly1305 = "0.9"
zeroize.workspace = true
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-reqwest = { version = "0.12", default-features = false, features = ["stream"] }
+reqwest = { workspace = true, features = ["stream"] }
bytes = "1.11.1"
futures-core = "0.3.32"
tokio = { version = "1", features = ["time"] }
diff --git a/rust/space/Cargo.toml b/rust/space/Cargo.toml
index 19060e83dd..e08d5d9408 100644
--- a/rust/space/Cargo.toml
+++ b/rust/space/Cargo.toml
@@ -20,6 +20,6 @@ zeroize.workspace = true
ente-accounts.workspace = true
ente-test-support.workspace = true
mockito.workspace = true
-reqwest = { version = "0.12", features = ["json", "rustls-tls-native-roots"] }
+reqwest = { workspace = true, features = ["json"] }
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
uuid = { version = "1.11", features = ["v4"] }