Compare commits

...

1 Commits

Author SHA1 Message Date
Adam Perry
c0d87cdf75 Update reqwest to 0.13 where easy.
This updates the default version for reqwest to the latest upstream.

Crates that are stuck on 0.12 for compatibility with other libraries will be handled in a follow-up.
2026-05-26 17:00:12 -07:00
17 changed files with 215 additions and 50 deletions

9
MODULE.bazel.lock generated

File diff suppressed because one or more lines are too long

218
codex-rs/Cargo.lock generated
View File

@@ -1804,7 +1804,7 @@ dependencies = [
"jsonwebtoken",
"pretty_assertions",
"rand 0.9.3",
"reqwest",
"reqwest 0.12.28",
"serde",
"serde_json",
"sha2",
@@ -1858,7 +1858,7 @@ dependencies = [
"http 1.4.0",
"pretty_assertions",
"regex-lite",
"reqwest",
"reqwest 0.12.28",
"schemars 0.8.22",
"serde",
"serde_json",
@@ -1937,7 +1937,7 @@ dependencies = [
"opentelemetry",
"opentelemetry_sdk",
"pretty_assertions",
"reqwest",
"reqwest 0.13.4",
"rmcp",
"serde",
"serde_json",
@@ -2000,7 +2000,7 @@ dependencies = [
"futures",
"libc",
"pretty_assertions",
"reqwest",
"reqwest 0.13.4",
"serde",
"serde_json",
"sha2",
@@ -2169,7 +2169,7 @@ dependencies = [
"codex-model-provider",
"codex-protocol",
"pretty_assertions",
"reqwest",
"reqwest 0.12.28",
"serde",
"serde_json",
]
@@ -2304,7 +2304,7 @@ dependencies = [
"pretty_assertions",
"rand 0.9.3",
"rcgen",
"reqwest",
"reqwest 0.12.28",
"rustls",
"rustls-native-certs",
"rustls-pki-types",
@@ -2366,7 +2366,7 @@ dependencies = [
"owo-colors",
"pretty_assertions",
"ratatui",
"reqwest",
"reqwest 0.12.28",
"serde",
"serde_json",
"supports-color 3.0.2",
@@ -2576,7 +2576,7 @@ dependencies = [
"pretty_assertions",
"rand 0.9.3",
"regex-lite",
"reqwest",
"reqwest 0.13.4",
"rmcp",
"serde",
"serde_json",
@@ -2649,7 +2649,7 @@ dependencies = [
"flate2",
"libc",
"pretty_assertions",
"reqwest",
"reqwest 0.12.28",
"semver",
"serde",
"serde_json",
@@ -2778,7 +2778,7 @@ dependencies = [
"http 1.4.0",
"pretty_assertions",
"prost 0.14.3",
"reqwest",
"reqwest 0.12.28",
"serde",
"serde_json",
"serial_test",
@@ -3064,7 +3064,7 @@ version = "0.0.0"
dependencies = [
"codex-core",
"codex-model-provider-info",
"reqwest",
"reqwest 0.13.4",
"serde_json",
"tokio",
"tracing",
@@ -3098,7 +3098,7 @@ dependencies = [
"pretty_assertions",
"rand 0.9.3",
"regex-lite",
"reqwest",
"reqwest 0.12.28",
"serde",
"serde_json",
"serial_test",
@@ -3362,7 +3362,7 @@ dependencies = [
"codex-model-provider-info",
"futures",
"pretty_assertions",
"reqwest",
"reqwest 0.13.4",
"semver",
"serde_json",
"tokio",
@@ -3390,7 +3390,7 @@ dependencies = [
"opentelemetry_sdk",
"os_info",
"pretty_assertions",
"reqwest",
"reqwest 0.12.28",
"serde",
"serde_json",
"strum_macros 0.28.0",
@@ -3442,7 +3442,7 @@ dependencies = [
"landlock",
"pretty_assertions",
"quick-xml",
"reqwest",
"reqwest 0.13.4",
"schemars 0.8.22",
"seccompiler",
"serde",
@@ -3490,7 +3490,7 @@ dependencies = [
"ctor 0.6.3",
"libc",
"pretty_assertions",
"reqwest",
"reqwest 0.13.4",
"serde",
"serde_json",
"tiny_http",
@@ -3518,7 +3518,7 @@ dependencies = [
"keyring",
"oauth2",
"pretty_assertions",
"reqwest",
"reqwest 0.12.28",
"rmcp",
"serde",
"serde_json",
@@ -3852,7 +3852,7 @@ dependencies = [
"ratatui",
"ratatui-macros",
"regex-lite",
"reqwest",
"reqwest 0.13.4",
"rmcp",
"serde",
"serde_json",
@@ -4423,7 +4423,7 @@ dependencies = [
"opentelemetry_sdk",
"pretty_assertions",
"regex-lite",
"reqwest",
"reqwest 0.13.4",
"serde_json",
"shlex",
"similar",
@@ -4468,7 +4468,7 @@ dependencies = [
"core-foundation-sys",
"coreaudio-rs",
"dasp_sample",
"jni",
"jni 0.21.1",
"js-sys",
"libc",
"mach2",
@@ -8140,19 +8140,68 @@ dependencies = [
"cesu8",
"cfg-if",
"combine",
"jni-sys",
"jni-sys 0.3.0",
"log",
"thiserror 1.0.69",
"walkdir",
"windows-sys 0.45.0",
]
[[package]]
name = "jni"
version = "0.22.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
dependencies = [
"cfg-if",
"combine",
"jni-macros",
"jni-sys 0.4.1",
"log",
"simd_cesu8",
"thiserror 2.0.18",
"walkdir",
"windows-link",
]
[[package]]
name = "jni-macros"
version = "0.22.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
dependencies = [
"proc-macro2",
"quote",
"rustc_version",
"simd_cesu8",
"syn 2.0.114",
]
[[package]]
name = "jni-sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]]
name = "jni-sys"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
dependencies = [
"jni-sys-macros",
]
[[package]]
name = "jni-sys-macros"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
dependencies = [
"quote",
"syn 2.0.114",
]
[[package]]
name = "jobserver"
version = "0.1.34"
@@ -8358,7 +8407,7 @@ source = "git+https://github.com/juberti-oai/rust-sdks.git?rev=e2d1d1d230c6fc9df
dependencies = [
"cxx",
"glib",
"jni",
"jni 0.21.1",
"js-sys",
"lazy_static",
"livekit-protocol",
@@ -8799,7 +8848,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
dependencies = [
"bitflags 2.10.0",
"jni-sys",
"jni-sys 0.3.0",
"log",
"ndk-sys",
"num_enum",
@@ -8818,7 +8867,7 @@ version = "0.5.0+25.2.9519653"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
dependencies = [
"jni-sys",
"jni-sys 0.3.0",
]
[[package]]
@@ -9113,12 +9162,12 @@ version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d"
dependencies = [
"base64 0.22.1",
"base64 0.21.7",
"chrono",
"getrandom 0.2.17",
"http 1.4.0",
"rand 0.8.5",
"reqwest",
"reqwest 0.12.28",
"serde",
"serde_json",
"serde_path_to_error",
@@ -9313,7 +9362,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
dependencies = [
"jni",
"jni 0.21.1",
"ndk",
"ndk-context",
"num-derive",
@@ -9479,7 +9528,7 @@ dependencies = [
"bytes",
"http 1.4.0",
"opentelemetry",
"reqwest",
"reqwest 0.12.28",
]
[[package]]
@@ -9494,7 +9543,7 @@ dependencies = [
"opentelemetry-proto",
"opentelemetry_sdk",
"prost 0.14.3",
"reqwest",
"reqwest 0.12.28",
"serde_json",
"thiserror 2.0.18",
"tokio",
@@ -9581,7 +9630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
dependencies = [
"libc",
"windows-sys 0.61.2",
"windows-sys 0.45.0",
]
[[package]]
@@ -10327,6 +10376,7 @@ version = "0.11.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
dependencies = [
"aws-lc-rs",
"bytes",
"getrandom 0.3.4",
"lru-slab",
@@ -10979,11 +11029,57 @@ dependencies = [
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-streams",
"wasm-streams 0.4.2",
"web-sys",
"webpki-roots 1.0.5",
]
[[package]]
name = "reqwest"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
dependencies = [
"base64 0.22.1",
"bytes",
"cookie",
"cookie_store",
"encoding_rs",
"futures-channel",
"futures-core",
"futures-util",
"h2",
"http 1.4.0",
"http-body 1.0.1",
"http-body-util",
"hyper",
"hyper-rustls",
"hyper-util",
"js-sys",
"log",
"mime",
"percent-encoding",
"pin-project-lite",
"quinn",
"rustls",
"rustls-pki-types",
"rustls-platform-verifier",
"serde",
"serde_json",
"sync_wrapper",
"tokio",
"tokio-rustls",
"tokio-util",
"tower",
"tower-http",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-streams 0.5.0",
"web-sys",
]
[[package]]
name = "resb"
version = "0.1.2"
@@ -11044,7 +11140,7 @@ dependencies = [
"pin-project-lite",
"process-wrap",
"rand 0.9.3",
"reqwest",
"reqwest 0.12.28",
"rmcp-macros",
"schemars 1.2.1",
"serde",
@@ -11248,6 +11344,33 @@ dependencies = [
"zeroize",
]
[[package]]
name = "rustls-platform-verifier"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0"
dependencies = [
"core-foundation 0.10.1",
"core-foundation-sys",
"jni 0.22.4",
"log",
"once_cell",
"rustls",
"rustls-native-certs",
"rustls-platform-verifier-android",
"rustls-webpki",
"security-framework 3.5.1",
"security-framework-sys",
"webpki-root-certs",
"windows-sys 0.61.2",
]
[[package]]
name = "rustls-platform-verifier-android"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
[[package]]
name = "rustls-webpki"
version = "0.103.13"
@@ -11585,7 +11708,7 @@ checksum = "2f925d575b468e88b079faf590a8dd0c9c99e2ec29e9bab663ceb8b45056312f"
dependencies = [
"httpdate",
"native-tls",
"reqwest",
"reqwest 0.12.28",
"sentry-actix",
"sentry-backtrace",
"sentry-contexts",
@@ -12016,6 +12139,16 @@ version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
[[package]]
name = "simd_cesu8"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
dependencies = [
"rustc_version",
"simdutf8",
]
[[package]]
name = "simdutf8"
version = "0.1.5"
@@ -13992,6 +14125,19 @@ dependencies = [
"web-sys",
]
[[package]]
name = "wasm-streams"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb"
dependencies = [
"futures-util",
"js-sys",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
]
[[package]]
name = "wayland-backend"
version = "0.3.12"
@@ -14089,7 +14235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00f1243ef785213e3a32fa0396093424a3a6ea566f9948497e5a2309261a4c97"
dependencies = [
"core-foundation 0.10.1",
"jni",
"jni 0.21.1",
"log",
"ndk-context",
"objc2",
@@ -14147,7 +14293,7 @@ dependencies = [
"anyhow",
"fs2",
"regex",
"reqwest",
"reqwest 0.12.28",
"scratch",
"semver",
"zip 0.6.6",
@@ -14236,7 +14382,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
"windows-sys 0.61.2",
"windows-sys 0.48.0",
]
[[package]]

View File

@@ -341,7 +341,7 @@ rcgen = { version = "0.14.7", default-features = false, features = [
] }
regex = "1.12.3"
regex-lite = "0.1.8"
reqwest = { version = "0.12", features = ["cookies"] }
reqwest = { version = "0.13", features = ["cookies"] }
rmcp = { version = "0.15.0", default-features = false }
runfiles = { git = "https://github.com/dzbarsky/rules_rust", rev = "b56cbaa8465e74127f1ea216f813cd377295ad81" }
rustls = { version = "0.23", default-features = false, features = [

View File

@@ -21,7 +21,8 @@ crypto_box = { workspace = true }
ed25519-dalek = { workspace = true }
jsonwebtoken = { workspace = true }
rand = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
# Must match the login client's public reqwest client type.
reqwest = { version = "0.12", features = ["json"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
sha2 = { workspace = true }

View File

@@ -20,7 +20,7 @@ codex-utils-home-dir = { workspace = true }
codex-uds = { workspace = true }
futures = { workspace = true }
libc = { workspace = true }
reqwest = { workspace = true, features = ["rustls-tls"] }
reqwest = { workspace = true, features = ["rustls"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
sha2 = { workspace = true }

View File

@@ -113,7 +113,7 @@ hmac = { workspace = true }
opentelemetry = { workspace = true }
opentelemetry_sdk = { workspace = true }
pretty_assertions = { workspace = true }
reqwest = { workspace = true, features = ["rustls-tls"] }
reqwest = { workspace = true, features = ["rustls"] }
rmcp = { workspace = true, default-features = false, features = [
"elicitation",
"server",

View File

@@ -16,6 +16,7 @@ workspace = true
anyhow = "1"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
# Must match codex-client's public reqwest client types.
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
codex-backend-openapi-models = { path = "../codex-backend-openapi-models" }
codex-api = { workspace = true }

View File

@@ -29,7 +29,8 @@ codex-utils-cli = { workspace = true }
crossterm = { workspace = true, features = ["event-stream"] }
owo-colors = { workspace = true, features = ["supports-colors"] }
ratatui = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
# Must match codex-client's public reqwest client types.
reqwest = { version = "0.12", features = ["json"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
supports-color = { workspace = true }

View File

@@ -15,7 +15,8 @@ codex-protocol = { workspace = true }
codex-utils-rustls-provider = { workspace = true }
futures = { workspace = true }
http = { workspace = true }
reqwest = { workspace = true, features = ["json", "stream"] }
# Must match codex-client's public reqwest client types.
reqwest = { version = "0.12", features = ["json", "stream"] }
schemars = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
@@ -36,7 +37,7 @@ pretty_assertions = { workspace = true }
tempfile = { workspace = true }
tokio-test = { workspace = true }
wiremock = { workspace = true }
reqwest = { workspace = true }
reqwest = { version = "0.12" }
[lints]
workspace = true

View File

@@ -12,7 +12,8 @@ futures = { workspace = true }
http = { workspace = true }
opentelemetry = { workspace = true }
rand = { workspace = true }
reqwest = { workspace = true, features = ["json", "rustls-tls-native-roots", "stream"] }
# Public helper and transport APIs expose reqwest types consumed by OAuth/RMCP callers on 0.12.
reqwest = { version = "0.12", features = ["cookies", "json", "rustls-tls-native-roots", "stream"] }
rustls = { workspace = true }
rustls-native-certs = { workspace = true }
rustls-pki-types = { workspace = true }

View File

@@ -31,7 +31,8 @@ codex-utils-plugins = { workspace = true }
chrono = { workspace = true }
dirs = { workspace = true }
flate2 = { workspace = true }
reqwest = { workspace = true }
# Must match the login client's public reqwest client type.
reqwest = { version = "0.12" }
semver = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }

View File

@@ -26,7 +26,8 @@ codex-utils-absolute-path = { workspace = true }
codex-utils-pty = { workspace = true }
codex-utils-rustls-provider = { workspace = true }
futures = { workspace = true }
reqwest = { workspace = true, features = ["json", "rustls-tls", "stream"] }
# Must match codex-client's public reqwest client types.
reqwest = { version = "0.12", features = ["json", "rustls-tls", "stream"] }
prost = "0.14.3"
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }

View File

@@ -13,7 +13,7 @@ doctest = false
[dependencies]
codex-core = { path = "../core" }
codex-model-provider-info = { path = "../model-provider-info" }
reqwest = { version = "0.12", features = ["json", "stream"] }
reqwest = { version = "0.13", features = ["json", "stream"] }
serde_json = "1"
tokio = { version = "1", features = ["rt"] }
tracing = { version = "0.1.44", features = ["log"] }

View File

@@ -24,7 +24,8 @@ codex-utils-template = { workspace = true }
once_cell = { workspace = true }
os_info = { workspace = true }
rand = { workspace = true }
reqwest = { workspace = true, features = ["json", "blocking"] }
# Must match codex-client's public reqwest client types.
reqwest = { version = "0.12", features = ["json", "blocking"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
sha2 = { workspace = true }

View File

@@ -47,7 +47,8 @@ opentelemetry_sdk = { workspace = true, features = [
] }
http = { workspace = true }
os_info = { workspace = true }
reqwest = { workspace = true, features = ["blocking", "rustls-tls"] }
# OpenTelemetry 0.31 implements HttpClient for reqwest 0.12 client types.
reqwest = { version = "0.12", features = ["blocking", "rustls-tls"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
strum_macros = { workspace = true }

View File

@@ -22,7 +22,7 @@ clap = { workspace = true, features = ["derive"] }
codex-process-hardening = { workspace = true }
ctor = { workspace = true }
libc = { workspace = true }
reqwest = { workspace = true, features = ["blocking", "json", "rustls-tls"] }
reqwest = { workspace = true, features = ["blocking", "json", "rustls"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
tiny_http = { workspace = true }

View File

@@ -26,6 +26,7 @@ bytes = { workspace = true }
futures = { workspace = true, default-features = false, features = ["std"] }
keyring = { workspace = true, features = ["crypto-rust"] }
oauth2 = "5"
# RMCP and OAuth expose reqwest 0.12 client types through their auth APIs.
reqwest = { version = "0.12", default-features = false, features = [
"json",
"stream",