From 3c204ee88335e09fcf94514ac2a76d0aa07e463d Mon Sep 17 00:00:00 2001 From: Filip Tibell Date: Sat, 6 May 2023 10:45:17 +0200 Subject: [PATCH] Update cargo manifest to use new dependency structure --- Cargo.lock | 1 + Cargo.toml | 12 ++++++++++++ packages/cli/Cargo.toml | 1 + packages/lib/Cargo.toml | 14 +------------- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e605eac..a6ec783 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1103,6 +1103,7 @@ dependencies = [ "lune", "once_cell", "regex", + "reqwest", "serde", "serde_json", "serde_yaml", diff --git a/Cargo.toml b/Cargo.toml index 64e4f5d..cc103cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,6 +30,18 @@ serde_json = { version = "1.0", features = ["preserve_order"] } serde_yaml = "0.9" toml = { version = "0.7", features = ["preserve_order"] } +# Using rustls instead of the default OpenSSL allows us to have much more portable binaries +# +# Notes: +# +# - Rustls does not yet compile on windows aarch64, so we use default tls there +# https://github.com/briansmith/ring/issues/1167 +# +# - Cargo does not support per-target features, we have to add the feature in the build command itself +# https://github.com/rust-lang/cargo/issues/1197 +# Check the `.justfile` or `.github/workflows/release.yaml` files for reference +reqwest = { version = "0.11", default-features = false } + # Profile for building the release binary, with the following options set: # # 1. Optimize for size diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index efd21d2..23b4eb7 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -25,6 +25,7 @@ lune = { path = "../lib" } console.workspace = true futures-util.workspace = true once_cell.workspace = true +reqwest.workspace = true serde.workspace = true serde_json.workspace = true serde_yaml.workspace = true diff --git a/packages/lib/Cargo.toml b/packages/lib/Cargo.toml index 2d0643e..0a73e1e 100644 --- a/packages/lib/Cargo.toml +++ b/packages/lib/Cargo.toml @@ -26,6 +26,7 @@ console.workspace = true futures-util.workspace = true mlua.workspace = true once_cell.workspace = true +reqwest.workspace = true serde.workspace = true serde_json.workspace = true serde_yaml.workspace = true @@ -45,18 +46,5 @@ hyper = { version = "0.14", features = ["full"] } hyper-tungstenite = { version = "0.9" } tokio-tungstenite = { version = "0.18" } -# Using rustls instead of the default OpenSSL allows us to have much more portable binaries -# -# Notes: -# -# - Rustls does not yet compile on windows aarch64, so we use default tls there -# https://github.com/briansmith/ring/issues/1167 -# -# - Cargo does not support per-target features, we have to add the feature in the build command itself -# https://github.com/rust-lang/cargo/issues/1197 -[dependencies.reqwest] -version = "0.11" -default-features = false - [dev-dependencies] anyhow = "1.0"