diff --git a/Cargo.toml b/Cargo.toml index 840e69f..4d8a0d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,23 +10,12 @@ members = [ "gday_file_transfer", ] -# Config for 'cargo dist' -# specifying build dependencies for aws-lc-sys -[workspace.metadata.dist.dependencies.homebrew] -llvm = '*' -cmake = '*' - - -[workspace.metadata.dist.dependencies.apt] -clang = '*' -build-essential = '*' -cmake = '*' - - -[workspace.metadata.dist.dependencies.chocolatey] -clang = '*' -cmake = '*' -nasm = '*' +# Keys that workspace packages will inherit +[workspace.package] +authors = ["Marcin Anforowicz"] +edition = "2021" +license = "MIT" +repository = "https://github.com/manforowicz/gday/" # Config for 'cargo dist' [workspace.metadata.dist] @@ -39,7 +28,7 @@ installers = [] # Target platforms to build apps for (Rust target-triple syntax) targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"] # Publish jobs to run in CI -pr-run-mode = "plan" +pr-run-mode = "upload" # Whether to install an updater program install-updater = false diff --git a/gday/Cargo.toml b/gday/Cargo.toml index f3a1a3d..0147d7f 100644 --- a/gday/Cargo.toml +++ b/gday/Cargo.toml @@ -1,11 +1,13 @@ [package] name = "gday" version = "0.1.1" -authors = ["Marcin Anforowicz"] -edition = "2021" description = "Command line tool to send files easily, securely, and directly, without a relay or port forwarding." -license = "MIT" -repository = "https://github.com/manforowicz/gday/" + +# Inherit these keys from workspace toml +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -23,9 +25,4 @@ owo-colors = "4.0.0" postcard = "1.0.8" rand = "0.8.5" serde = { version = "1.0.203", features = ["serde_derive"] } -thiserror = "1.0.61" - -[dev-dependencies] -assert_cmd = "2.0.14" -gday_server = { version = "0.1.1", path = "../gday_server" } -tempfile = "3.10.1" \ No newline at end of file +thiserror = "1.0.61" \ No newline at end of file diff --git a/gday_contact_exchange_protocol/Cargo.toml b/gday_contact_exchange_protocol/Cargo.toml index 3dcb753..9b4af4a 100644 --- a/gday_contact_exchange_protocol/Cargo.toml +++ b/gday_contact_exchange_protocol/Cargo.toml @@ -1,11 +1,13 @@ [package] name = "gday_contact_exchange_protocol" version = "0.1.1" -authors = ["Marcin Anforowicz"] -edition = "2021" description = "Protocol that peers can use to exchange their public and private socket addresses via a server." -license = "MIT" -repository = "https://github.com/manforowicz/gday/" + +# Inherit these keys from workspace toml +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/gday_encryption/Cargo.toml b/gday_encryption/Cargo.toml index 55d8481..0b5e50d 100644 --- a/gday_encryption/Cargo.toml +++ b/gday_encryption/Cargo.toml @@ -1,11 +1,13 @@ [package] name = "gday_encryption" version = "0.1.1" -authors = ["Marcin Anforowicz"] -edition = "2021" description = "A simple ChaCha20Poly1305 encryption wrapper around an IO stream." -license = "MIT" -repository = "https://github.com/manforowicz/gday/" + +# Inherit these keys from workspace toml +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/gday_file_transfer/Cargo.toml b/gday_file_transfer/Cargo.toml index b36adac..658b365 100644 --- a/gday_file_transfer/Cargo.toml +++ b/gday_file_transfer/Cargo.toml @@ -1,11 +1,13 @@ [package] name = "gday_file_transfer" version = "0.1.1" -authors = ["Marcin Anforowicz"] -edition = "2021" description = "A minimal protocol to securely transfer files over an IO stream. Used by gday." -license = "MIT" -repository = "https://github.com/manforowicz/gday/" + +# Inherit these keys from workspace toml +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/gday_hole_punch/Cargo.toml b/gday_hole_punch/Cargo.toml index 7a579ca..3f144e8 100644 --- a/gday_hole_punch/Cargo.toml +++ b/gday_hole_punch/Cargo.toml @@ -1,11 +1,13 @@ [package] name = "gday_hole_punch" version = "0.1.1" -authors = ["Marcin Anforowicz"] -edition = "2021" description = "Establish an authenticated peer-to-peer internet connection using TCP hole-punching." -license = "MIT" -repository = "https://github.com/manforowicz/gday/" + +# Inherit these keys from workspace toml +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -14,7 +16,7 @@ blake3 = "1.5.1" gday_contact_exchange_protocol = { version = "0.1.1", path = "../gday_contact_exchange_protocol" } log = "0.4.21" rand = "0.8.5" -rustls = "0.23.9" +rustls = { version = "0.23.9", features = ["ring", "log", "logging", "std", "tls12"], default-features = false } serde = "1.0.203" socket2 = "0.5.7" spake2 = { version = "0.4.0", features = ["std"] } diff --git a/gday_server/Cargo.toml b/gday_server/Cargo.toml index c93a173..e6af405 100644 --- a/gday_server/Cargo.toml +++ b/gday_server/Cargo.toml @@ -1,11 +1,13 @@ [package] name = "gday_server" version = "0.1.1" -authors = ["Marcin Anforowicz"] -edition = "2021" description = "A server that lets 2 peers exchange their private and public addresses via the gday contact exchange protocol." -license = "MIT" -repository = "https://github.com/manforowicz/gday/" + +# Inherit these keys from workspace toml +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -19,7 +21,7 @@ tokio = { version = "1.38.0", features = [ "time", "sync", ] } -tokio-rustls = "0.26.0" +tokio-rustls = { version = "0.26.0", features = ["ring", "logging", "tls12"], default-features = false } gday_contact_exchange_protocol = { path = "../gday_contact_exchange_protocol" } thiserror = "1.0.61" log = "0.4.21"