Skip to content

Commit

Permalink
Update all dependencies (minor) (#665)
Browse files Browse the repository at this point in the history
  • Loading branch information
pcrumley authored Mar 5, 2024
1 parent 1c6a75b commit eec248f
Show file tree
Hide file tree
Showing 9 changed files with 218 additions and 206 deletions.
388 changes: 200 additions & 188 deletions Cargo.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
members = ["crates/esthri", "crates/esthri-internals", "crates/esthri-cli", "crates/esthri-test"]

[workspace.dependencies]
aws-sdk-s3 = "1.15.0"
aws-types = "1.1.4"
aws-config = { version = "1.1.4", features = ["behavior-version-latest"]}
aws-smithy-runtime = "1.1.5"
aws-sdk-s3 = "1.17.0"
aws-types = "1.1.7"
aws-config = { version = "1.1.7", features = ["behavior-version-latest"]}
aws-smithy-runtime = "1.1.7"
hyper = "0.14.28" # hyper 0.14 is the version used in the aws-smithy-runtime api. Can't upgrade to "1" until smithy-runtime does


Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUST_VERSION=1.72.0
ARG RUST_VERSION=1.74.0

FROM rust:${RUST_VERSION}-slim-buster

Expand Down
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pipeline {
}
}
stage('Prepare docker (Rust MSRV)') {
agent { dockerfile { reuseNode true; additionalBuildArgs "--build-arg=RUST_VERSION=1.72.0"} }
agent { dockerfile { reuseNode true; additionalBuildArgs "--build-arg=RUST_VERSION=1.74.0"} }
steps {
sh("echo done")
}
Expand All @@ -56,13 +56,13 @@ pipeline {
}
}
stage('Build MSRV (rustls)') {
agent { dockerfile { reuseNode true; additionalBuildArgs "--build-arg=RUST_VERSION=1.72.0"} }
agent { dockerfile { reuseNode true; additionalBuildArgs "--build-arg=RUST_VERSION=1.74.0"} }
steps {
sh("cargo make -p dev+msrv build-lib")
}
}
stage('Build MSRV (nativetls)') {
agent { dockerfile { reuseNode true; additionalBuildArgs "--build-arg=RUST_VERSION=1.72.0"} }
agent { dockerfile { reuseNode true; additionalBuildArgs "--build-arg=RUST_VERSION=1.74.0"} }
steps {
sh("cargo make -p dev+msrv+nativetls build-lib")
}
Expand Down
4 changes: 2 additions & 2 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ TLS_PROVIDER = "nativetls"
VERBOSE = "-vv"

[env.'dev+msrv']
MSRV = "+1.72.0"
MSRV = "+1.74.0"
VERBOSE = "-vv"

[env.'dev+msrv+nativetls']
TLS_PROVIDER = "nativetls"
MSRV = "+1.72.0"
MSRV = "+1.74.0"
VERBOSE = "-vv"

[tasks.check]
Expand Down
6 changes: 3 additions & 3 deletions crates/esthri-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ mime_guess = "2.0"
once_cell = "1.19"
sanitize-filename = "0.5"
serde = "1"
clap = { version = "4.4.18", features = ["derive", "env"] }
tokio = { version = "1.35.1", features = ["rt-multi-thread", "signal", "sync"] }
clap = { version = "4.5.1", features = ["derive", "env"] }
tokio = { version = "1.36.0", features = ["rt-multi-thread", "signal", "sync"] }
tokio-util = { version = "0.7.10", features = ["compat", "codec"] }
warp = "0.3"

[dev-dependencies]
esthri = { path = "../esthri", default-features = false, features=["blocking"] }
esthri-test = { path = "../esthri-test" }
assert_cmd = "2.0.13"
assert_cmd = "2.0.14"
backtrace = "0.3"
fs_extra = "1.3"
md5 = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion crates/esthri-internals/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = "https://github.com/swift-nav/esthri/"
homepage = "https://github.com/swift-nav/esthri/"
readme = "../../README.md"
keywords = ["aws", "s3"]
rust-version = "1.72.0"
rust-version = "1.74.0"

[features]
default = []
Expand Down
2 changes: 1 addition & 1 deletion crates/esthri-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ once_cell = "1.19"
tempdir = "0.3"
uuid = { version="1.7.0", features=["v4"] }
fs_extra = "1.3.0"
tokio = "1.35.1"
tokio = "1.36.0"
futures = "0.3"

aws-sdk-s3 = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions crates/esthri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = "https://github.com/swift-nav/esthri/"
homepage = "https://github.com/swift-nav/esthri/"
readme = "../../README.md"
keywords = ["aws", "s3"]
rust-version = "1.72.0"
rust-version = "1.74.0"

[features]
default = ["blocking", "rustls"]
Expand Down Expand Up @@ -37,14 +37,14 @@ regex = "1"
serde = { version = "1", features = ["derive"] }
tempfile = "3"
thiserror = "1"
tokio = { version = "1.35.1", features = ["fs", "io-util", "sync", "parking_lot", "rt", "macros"] }
tokio = { version = "1.36.0", features = ["fs", "io-util", "sync", "parking_lot", "rt", "macros"] }
tokio-retry = "0.3"
tokio-stream = "0.1.14"
tokio-util = { version = "0.7.10", features = ["io"] }
walkdir = "2"
strum = "0.26.1"
strum_macros = "0.26.1"
reqwest = { version="0.11.23", features=["stream", "json"], default-features = false }
reqwest = { version="0.11.24", features=["stream", "json"], default-features = false }
serde-tuple-vec-map = "1.0.1"

aws-sdk-s3 = { workspace = true }
Expand Down

0 comments on commit eec248f

Please sign in to comment.