Skip to content

Commit

Permalink
Merge branch 'direct-minimal-versions' into s2n-tls-provider
Browse files Browse the repository at this point in the history
  • Loading branch information
goatgoose committed Jan 22, 2025
2 parents ab7f888 + 92dffbd commit c0f6f84
Show file tree
Hide file tree
Showing 16 changed files with 81 additions and 79 deletions.
4 changes: 2 additions & 2 deletions rust-runtime/aws-smithy-async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ rt-tokio = ["tokio/time"]
test-util = ["rt-tokio", "tokio/rt"]

[dependencies]
pin-project-lite = "0.2"
tokio = { version = "1.23.1", features = ["sync"] }
pin-project-lite = "0.2.14"
tokio = { version = "1.40.0", features = ["sync"] }
futures-util = { version = "0.3.29", default-features = false }

[dev-dependencies]
Expand Down
10 changes: 5 additions & 5 deletions rust-runtime/aws-smithy-checksums/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ repository = "https://github.com/smithy-lang/smithy-rs"
[dependencies]
aws-smithy-http = { path = "../aws-smithy-http" }
aws-smithy-types = { path = "../aws-smithy-types" }
bytes = "1"
bytes = "1.4.0"
crc32c = "0.6.8"
crc32fast = "1.3"
hex = "0.4.3"
http = "0.2.8"
http-body = "0.4.4"
http = "0.2.9"
http-body = "0.4.5"
md-5 = "0.10"
pin-project-lite = "0.2.9"
pin-project-lite = "0.2.14"
sha1 = "0.10"
sha2 = "0.10"
tracing = "0.1"
tracing = "0.1.40"
crc64fast-nvme = "1.1.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion rust-runtime/aws-smithy-compression/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ http-0-2 = { package = "http", version = "0.2.9", optional = true }
http-1-0 = { package = "http", version = "1", optional = true }
http-body-0-4 = { package = "http-body", version = "0.4.5", optional = true }
http-body-1-0 = { package = "http-body", version = "1", optional = true }
http-body-util = { version = "0.1.1", optional = true }
http-body-util = { version = "0.1.2", optional = true }
pin-project-lite = "0.2.14"
tracing = "0.1.40"

Expand Down
2 changes: 1 addition & 1 deletion rust-runtime/aws-smithy-eventstream/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ derive-arbitrary = ["arbitrary", "derive_arbitrary"]
[dependencies]
arbitrary = { version = "1.3", optional = true }
aws-smithy-types = { path = "../aws-smithy-types" }
bytes = "1"
bytes = "1.4.0"
crc32fast = "1.3"
derive_arbitrary = { version = "1.3", optional = true }

Expand Down
12 changes: 6 additions & 6 deletions rust-runtime/aws-smithy-http-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ aws-smithy-async = { path = "../aws-smithy-async" }
aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api", features = ["client"] }
aws-smithy-types = { path = "../aws-smithy-types" }
aws-smithy-protocol-test = { path = "../aws-smithy-protocol-test", optional = true }
h2 = { version = "0.4", default-features = false }
h2 = { version = "0.4.2", default-features = false }
tokio = { version = "1.40", features = [] }
once_cell = "1.20.1"
pin-project-lite = "0.2.14"
tracing = "0.1"
tracing = "0.1.40"

# hyper 1.x stack
hyper = { version = "1", features = ["client", "http1", "http2"], optional = true }
hyper = { version = "1.4.0", features = ["client", "http1", "http2"], optional = true }
hyper-util = { version = "0.1.7", features = ["http1", "http2"], optional = true }
http-1x = { package = "http", version = "1" , optional = true }
http-body-1x = { package = "http-body", version = "1", optional = true}
Expand All @@ -91,15 +91,15 @@ tower = { version = "0.5.1", optional = true }
# end hyper 1.x stack deps

# legacy hyper-0.14.x stack the SDK/runtime GA'd with
http-02x = { package = "http", version = "0.2.8", optional = true}
http-body-04x = { package = "http-body", version = "0.4.4" , optional = true}
http-02x = { package = "http", version = "0.2.9", optional = true}
http-body-04x = { package = "http-body", version = "0.4.5" , optional = true}
hyper-0-14 = { package = "hyper", version = "0.14.26", default-features = false, features = ["client", "http1", "http2", "tcp", "stream"], optional = true }
legacy-hyper-rustls = { package = "hyper-rustls", version = "0.24", features = ["rustls-native-certs", "http2"], optional = true }
legacy-rustls = { package = "rustls", version = "0.21.8", optional = true }
# end legacy stack deps

# test util stack
bytes = { version = "1", optional = true }
bytes = { version = "1.4.0", optional = true }
serde = { version = "1.0.210", features = ["derive"], optional = true }
serde_json = { version = "1.0.128", features = ["preserve_order"], optional = true }
indexmap = { version = "2.6.0", features = ["serde"], optional = true }
Expand Down
20 changes: 10 additions & 10 deletions rust-runtime/aws-smithy-http-server-python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,27 @@ aws-smithy-http-server = { path = "../aws-smithy-http-server", features = ["aws-
aws-smithy-json = { path = "../aws-smithy-json" }
aws-smithy-types = { path = "../aws-smithy-types", features = ["byte-stream-poll-next", "http-body-0-4-x"] }
aws-smithy-xml = { path = "../aws-smithy-xml" }
bytes = "1.2"
bytes = "1.4.0"
futures = "0.3"
http = "0.2"
http = "0.2.9"
hyper = { version = "0.14.26", features = ["server", "http1", "http2", "tcp", "stream"] }
tls-listener = { version = "0.7.0", features = ["rustls", "hyper-h2"] }
rustls-pemfile = "1.0.1"
tokio-rustls = "0.24.0"
lambda_http = { version = "0.8.0" }
lambda_http = { version = "0.8.3" }
num_cpus = "1.13.1"
parking_lot = "0.12.1"
pin-project-lite = "0.2"
pin-project-lite = "0.2.14"
pyo3 = "0.18.2"
pyo3-asyncio = { version = "0.18.0", features = ["tokio-runtime"] }
signal-hook = { version = "0.3.14", features = ["extended-siginfo"] }
socket2 = { version = "0.5.2", features = ["all"] }
thiserror = "1.0.32"
tokio = { version = "1.20.1", features = ["full"] }
tokio-stream = "0.1"
socket2 = { version = "0.5.5", features = ["all"] }
thiserror = "1.0.40"
tokio = { version = "1.40.0", features = ["full"] }
tokio-stream = "0.1.2"
tower = { version = "0.4.13", features = ["util"] }
tracing = "0.1.36"
tracing-subscriber = { version = "0.3.15", features = ["json", "env-filter"] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.16", features = ["json", "env-filter"] }
tracing-appender = { version = "0.2.2"}

[dev-dependencies]
Expand Down
22 changes: 11 additions & 11 deletions rust-runtime/aws-smithy-http-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api", features = ["http
aws-smithy-types = { path = "../aws-smithy-types", features = ["http-body-0-4-x", "hyper-0-14-x"] }
aws-smithy-xml = { path = "../aws-smithy-xml" }
aws-smithy-cbor = { path = "../aws-smithy-cbor" }
bytes = "1.1"
bytes = "1.4.0"
futures-util = { version = "0.3.29", default-features = false }
http = "0.2"
http-body = "0.4"
http = "0.2.9"
http-body = "0.4.5"
hyper = { version = "0.14.26", features = ["server", "http1", "http2", "tcp", "stream"] }
lambda_http = { version = "0.8.0", optional = true }
lambda_http = { version = "0.8.3", optional = true }
mime = "0.3.17"
nom = "7"
once_cell = "1.13"
pin-project-lite = "0.2"
nom = "7.1.3"
once_cell = "1.20.1"
pin-project-lite = "0.2.14"
regex = "1.5.5"
serde_urlencoded = "0.7"
thiserror = "1.0.40"
tokio = { version = "1.23.1", features = ["full"] }
tower = { version = "0.4.11", features = ["util", "make"], default-features = false }
tokio = { version = "1.40.0", features = ["full"] }
tower = { version = "0.4.13", features = ["util", "make"], default-features = false }
tower-http = { version = "0.3", features = ["add-extension", "map-response-body"] }
tracing = "0.1.35"
uuid = { version = "1", features = ["v4", "fast-rng"], optional = true }
tracing = "0.1.40"
uuid = { version = "1.1.2", features = ["v4", "fast-rng"], optional = true }

[dev-dependencies]
pretty_assertions = "1"
Expand Down
16 changes: 8 additions & 8 deletions rust-runtime/aws-smithy-http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@ rt-tokio = ["aws-smithy-types/rt-tokio"]
aws-smithy-eventstream = { path = "../aws-smithy-eventstream", optional = true }
aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api", features = ["client", "http-02x"] }
aws-smithy-types = { path = "../aws-smithy-types", features = ["byte-stream-poll-next", "http-body-0-4-x"] }
bytes = "1"
bytes = "1.4.0"
bytes-utils = "0.1"
# TODO(hyper1) - Complete the breaking changes by updating to http 1.x ecosystem fully in this crate. Also remove hyper 0.14 from dev
http-02x = { package = "http", version = "0.2.3" }
http-02x = { package = "http", version = "0.2.9" }
http-1x = { package = "http", version = "1" }
http-body-04x = { package = "http-body", version = "0.4.4" }
once_cell = "1.10"
percent-encoding = "2.1.0"
pin-project-lite = "0.2.9"
http-body-04x = { package = "http-body", version = "0.4.5" }
once_cell = "1.20.1"
percent-encoding = "2.3.1"
pin-project-lite = "0.2.14"
pin-utils = "0.1.0"
tracing = "0.1"
tracing = "0.1.40"

# For an adapter to enable the `Stream` trait for `aws_smithy_types::byte_stream::ByteStream`
futures-core = "0.3.29"
futures-core = "0.3.31"

[dev-dependencies]
async-stream = "0.3"
Expand Down
4 changes: 2 additions & 2 deletions rust-runtime/aws-smithy-protocol-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ assert-json-diff = "1.1"
base64-simd = "0.8"
cbor-diag = "0.1.12"
ciborium = "0.2"
http = "0.2.1"
http = "0.2.9"
pretty_assertions = "1.3"
regex-lite = "0.1.5"
roxmltree = "0.14.1"
serde_json = "1"
serde_json = "1.0.128"
thiserror = "1.0.40"
aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api", features = ["client"] }

Expand Down
10 changes: 5 additions & 5 deletions rust-runtime/aws-smithy-runtime-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ http-1x = []
[dependencies]
aws-smithy-async = { path = "../aws-smithy-async" }
aws-smithy-types = { path = "../aws-smithy-types" }
bytes = "1"
bytes = "1.4.0"
http-02x = { package = "http", version = "0.2.9" }
http-1x = { package = "http", version = "1" }
pin-project-lite = "0.2"
tokio = { version = "1.25", features = ["sync"] }
tracing = "0.1"
zeroize = { version = "1", optional = true }
pin-project-lite = "0.2.14"
tokio = { version = "1.40.0", features = ["sync"] }
tracing = "0.1.40"
zeroize = { version = "1.7.0", optional = true }

[dev-dependencies]
proptest = "1"
Expand Down
14 changes: 7 additions & 7 deletions rust-runtime/aws-smithy-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,21 @@ aws-smithy-http = { path = "../aws-smithy-http" }
aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api" }
aws-smithy-types = { path = "../aws-smithy-types", features = ["http-body-0-4-x"] }
aws-smithy-http-client = { path = "../aws-smithy-http-client", optional = true }
bytes = "1"
bytes = "1.4.0"
# Make sure to update `fastrand` in [dev-dependencies] if we bump the major version
# We probably need to update unit tests using the `fastrand` crate when that happens
fastrand = "2.0.0"
http-02x = { package = "http", version = "0.2.8" }
http-02x = { package = "http", version = "0.2.9" }
http-1x = { package = "http", version = "1" }
http-body-04x = { package = "http-body", version = "0.4.4" }
http-body-04x = { package = "http-body", version = "0.4.5" }
http-body-1x = { package = "http-body", version = "1" }
# This avoids bringing `httparse` 1.9.0 and 1.9.1 through `hyper-0-14` that break unit tests of runtime crates
httparse = "1.8.0"
once_cell = "1.18.0"
pin-project-lite = "0.2.7"
once_cell = "1.20.1"
pin-project-lite = "0.2.14"
pin-utils = "0.1.0"
tokio = { version = "1.25", features = [] }
tracing = "0.1.37"
tokio = { version = "1.40.0", features = [] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.16", optional = true, features = ["env-filter", "fmt", "json"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion rust-runtime/aws-smithy-types-convert/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ aws-smithy-types = { path = "../aws-smithy-types", optional = true }
aws-smithy-async = { path = "../aws-smithy-async", optional = true }
chrono = { version = "0.4.35", optional = true, default-features = false, features = ["std"] }
time = { version = "0.3.4", optional = true }
futures-core = { version = "0.3.0", optional = true }
futures-core = { version = "0.3.31", optional = true }

[package.metadata.docs.rs]
all-features = true
Expand Down
18 changes: 9 additions & 9 deletions rust-runtime/aws-smithy-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@ serde-deserialize = []

[dependencies]
base64-simd = "0.8"
bytes = "1"
bytes = "1.4.0"
bytes-utils = "0.1"
http = { version = "0.2.3", optional = true }
http = { version = "0.2.9", optional = true }
http-1x = { package = "http", version = "1", optional = true }
http-body-0-4 = { package = "http-body", version = "0.4.4", optional = true }
http-body-0-4 = { package = "http-body", version = "0.4.5", optional = true }
http-body-1-0 = { package = "http-body", version = "1", optional = true }
http-body-util = { version = "0.1.0", optional = true }
http-body-util = { version = "0.1.2", optional = true }
hyper-0-14 = { package = "hyper", version = "0.14.26", optional = true }
itoa = "1.0.0"
num-integer = "0.1.44"
pin-project-lite = "0.2.9"
pin-project-lite = "0.2.14"
pin-utils = "0.1.0"
ryu = "1.0.5"
time = { version = "0.3.4", features = ["parsing"] }

# ByteStream internals
futures-core = { version = "0.3.29", optional = true }
tokio = { version = "1.23.1", optional = true }
tokio-util = { version = "0.7", optional = true }
futures-core = { version = "0.3.31", optional = true }
tokio = { version = "1.40.0", optional = true }
tokio-util = { version = "0.7.1", optional = true }

[dev-dependencies]
base64 = "0.13.0"
Expand Down Expand Up @@ -91,7 +91,7 @@ name = "base64"
harness = false

[target."cfg(aws_sdk_unstable)".dependencies.serde]
version = "1"
version = "1.0.210"
features = ["derive"]

[lints.rust]
Expand Down
2 changes: 1 addition & 1 deletion rust-runtime/aws-smithy-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repository = "https://github.com/awslabs/smithy-rs"
aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api", features = ["http-1x"]}
aws-smithy-http = { path = "../aws-smithy-http" }
aws-smithy-types = { path = "../aws-smithy-types" }
bytes = "1"
bytes = "1.4.0"
http = "1.0.0"
tracing = "0.1.40"
# Note the wasi crate will only build for target wasm32-wasi, but having a target
Expand Down
16 changes: 8 additions & 8 deletions rust-runtime/inlineable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ aws-smithy-runtime = { path = "../aws-smithy-runtime", features = ["client"] }
aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api", features = ["client", "test-util"] }
aws-smithy-types = { path = "../aws-smithy-types" }
aws-smithy-xml = { path = "../aws-smithy-xml" }
bytes = "1"
bytes = "1.4.0"
fastrand = "2.0.0"
futures-util = "0.3.29"
http = "0.2.1"
http-body = "0.4"
futures-util = "0.3.31"
http = "0.2.9"
http-body = "0.4.5"
md-5 = "0.10.0"
once_cell = "1.16.0"
percent-encoding = "2.2.0"
pin-project-lite = "0.2"
once_cell = "1.20.1"
percent-encoding = "2.3.1"
pin-project-lite = "0.2.14"
regex-lite = "0.1.5"
tracing = "0.1.37"
tracing = "0.1.40"
url = "2.5.4"

[dev-dependencies]
Expand Down
6 changes: 4 additions & 2 deletions tools/ci-scripts/check-rust-runtimes
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ do

echo -e "## ${C_YELLOW}Running 'cargo minimal-versions check' on ${runtime_path}...${C_RESET}"
# Print out the cargo tree with minimal versions for easier debugging
cargo +"${RUST_NIGHTLY_VERSION}" minimal-versions tree || echo "cargo minimal-versions tree failed"
cargo +"${RUST_NIGHTLY_VERSION}" minimal-versions check --all-features
cargo +"${RUST_NIGHTLY_VERSION}" minimal-versions tree --direct || echo "cargo minimal-versions tree failed"
# The `--direct` flag is used to test only direct dependencies, rather than all transitive dependencies. See:
# https://doc.rust-lang.org/cargo/reference/unstable.html#direct-minimal-versions
cargo +"${RUST_NIGHTLY_VERSION}" minimal-versions check --direct --all-features

for crate_path in *; do
if [[ -f "${crate_path}/external-types.toml" ]]; then
Expand Down

0 comments on commit c0f6f84

Please sign in to comment.