Skip to content

Commit

Permalink
Update some dependencies (#259)
Browse files Browse the repository at this point in the history
* Update rustls to 0.21
* Update awc and actix-http to 3.2.0
* Update mpart-async to 0.6
* Update MSRV to 1.70
  • Loading branch information
direc85 committed Dec 14, 2023
1 parent 38471db commit 34ad911
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ If you're using a Cargo workspace, you should add the `[patch.crates.io]` sectio

### Note on supported Rust versions

`libsignal-service-rs` is the at the core of [Whisperfish][whisperfish], a SailfishOS application. The SailfishOS Rust compiler is relatively old, and therefore the MSRV for `libsignal-service-actix` maps on the compiler for that operating system, including some lag. At moment of writing, this is **Rust 1.61**.
`libsignal-service-rs` is the at the core of [Whisperfish][whisperfish], a SailfishOS application. The SailfishOS Rust compiler updates seldomly, and therefore the MSRV maps on the compiler for that operating system. At moment of writing, this is **Rust 1.72**.

For other platforms, we don't mandate MSRV.
For other platforms, we don't mandate MSRV. In practice, however, it is **Rust 1.70**.

## Contributing

Expand Down
8 changes: 4 additions & 4 deletions libsignal-service-actix/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ rust-version = "1.70.0"
# the Send requirement in libsignal-service needs to be lifted by enabling `unsend-futures`.
libsignal-service = { path = "../libsignal-service", features = ["unsend-futures"] }

awc = { version = "3.0.0-beta.19", features = ["rustls"] }
awc = { version = "3.2.0", features = ["rustls-0_21"] }
actix = "0.13"
actix-http = "3.2.0"
actix-rt = "2.4"
# mpart-async 0.6 requires Rust 2021, violating MSRV = 1.52
mpart-async = "0.5"
mpart-async = "0.6"
serde_json = "1.0"
futures = "0.3"
bytes = "1"
rustls = "0.20"
rustls = "0.21"
rustls-pemfile = "0.3"
url = "2.1"
serde = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion libsignal-service-actix/src/push_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ fn get_client(cfg: &ServiceConfiguration, user_agent: String) -> Client {
ssl_config.alpn_protocols = vec![b"http/1.1".to_vec()];

let connector = Connector::new()
.rustls(Arc::new(ssl_config))
.rustls_021(Arc::new(ssl_config))
.timeout(Duration::from_secs(10)); // https://github.com/actix/actix-web/issues/1047
let client = awc::ClientBuilder::new()
.connector(connector)
Expand Down
2 changes: 1 addition & 1 deletion libsignal-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ prost-build = "0.10"
anyhow = "1.0"
tokio = { version = "1.0", features = ["macros", "rt"] }

rustls = "0.20"
rustls = "0.21"

[features]
unsend-futures = []

0 comments on commit 34ad911

Please sign in to comment.