diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-07-14 10:05:37 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-07-14 12:01:43 +0200 |
| commit | eacf10df12ea90a08211471f4e6058ae609b2ea4 (patch) | |
| tree | b77a5351c18a62b54981fea7e6f3a6742f496ec0 | |
| parent | 0836eb0babb61baa95b2cb5bd3bdb12647fc5df7 (diff) | |
| download | mullvadvpn-eacf10df12ea90a08211471f4e6058ae609b2ea4.tar.xz mullvadvpn-eacf10df12ea90a08211471f4e6058ae609b2ea4.zip | |
Set package fields in workspace and inherit in packages
32 files changed, 193 insertions, 150 deletions
diff --git a/Cargo.lock b/Cargo.lock index 7f8d7a7007..60a9ba694e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4227,7 +4227,7 @@ dependencies = [ [[package]] name = "translations-converter" -version = "0.1.0" +version = "0.0.0" dependencies = [ "derive_more", "htmlize", diff --git a/Cargo.toml b/Cargo.toml index 7e674b734a..c75e9cd472 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,11 @@ +[workspace.package] +version = "0.0.0" +authors = ["Mullvad VPN"] +repository = "https://github.com/mullvad/mullvadvpn-app/" +license = "GPL-3.0" +edition = "2021" +publish = false + [workspace] resolver = "2" members = [ diff --git a/android/translations-converter/Cargo.toml b/android/translations-converter/Cargo.toml index f3fbfb2e0a..dc7f1272d1 100644 --- a/android/translations-converter/Cargo.toml +++ b/android/translations-converter/Cargo.toml @@ -1,10 +1,12 @@ [package] name = "translations-converter" -version = "0.1.0" -authors = ["Mullvad VPN"] -license = "GPL-3.0" -edition = "2021" -publish = false +description = "Converts between PO and Android style localization formats" +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] derive_more = "0.99" diff --git a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml index 161dbf2e93..cc6337bd69 100644 --- a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml +++ b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml @@ -1,9 +1,11 @@ [package] name = "shadowsocks-proxy" -version = "0.0.0" -edition = "2021" -license = "GPL-3.0" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [lib] crate-type = [ "rlib", "staticlib" ] diff --git a/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml b/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml index 3a0e59fc15..0dff320f35 100644 --- a/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml +++ b/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml @@ -1,9 +1,11 @@ [package] name = "tunnel-obfuscator-proxy" -version = "0.0.0" -edition = "2021" -license = "GPL-3.0" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [lib] crate-type = [ "rlib", "staticlib" ] diff --git a/mullvad-api/Cargo.toml b/mullvad-api/Cargo.toml index 8710fec2c9..555eb13774 100644 --- a/mullvad-api/Cargo.toml +++ b/mullvad-api/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "mullvad-api" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Mullvad VPN API clients. Providing an interface to query our infrastructure for information." -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [features] # Allow the API server to use to be configured via MULLVAD_API_HOST and MULLVAD_API_ADDR. diff --git a/mullvad-cli/Cargo.toml b/mullvad-cli/Cargo.toml index 8f70fd9e3e..0b3c194005 100644 --- a/mullvad-cli/Cargo.toml +++ b/mullvad-cli/Cargo.toml @@ -1,11 +1,13 @@ [package] name = "mullvad-cli" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Manage the Mullvad VPN daemon via a convenient CLI" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true + [[bin]] name = "mullvad" diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index c651a232b5..3ebbcb6de0 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "mullvad-daemon" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Mullvad VPN daemon. Runs and controls the VPN tunnels" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [features] # Allow the API server to use to be configured diff --git a/mullvad-exclude/Cargo.toml b/mullvad-exclude/Cargo.toml index 1e550d7dfd..107824025b 100644 --- a/mullvad-exclude/Cargo.toml +++ b/mullvad-exclude/Cargo.toml @@ -1,10 +1,12 @@ [package] name = "mullvad-exclude" -version = "0.0.0" -authors = ["Mullvad VPN"] -license = "GPL-3.0" -edition = "2021" -publish = false +description = "Runs programs outside the Mullvad VPN tunnel on Linux" +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [target.'cfg(target_os = "linux")'.dependencies] nix = "0.23" diff --git a/mullvad-fs/Cargo.toml b/mullvad-fs/Cargo.toml index b2ae4176e0..c4800b283b 100644 --- a/mullvad-fs/Cargo.toml +++ b/mullvad-fs/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "mullvad-fs" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "File utility library" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] log = "0.4" diff --git a/mullvad-jni/Cargo.toml b/mullvad-jni/Cargo.toml index b4974e7493..dbaf5c12d4 100644 --- a/mullvad-jni/Cargo.toml +++ b/mullvad-jni/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "mullvad-jni" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "JNI interface for the Mullvad daemon" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [features] # Allow the API server to use to be configured diff --git a/mullvad-management-interface/Cargo.toml b/mullvad-management-interface/Cargo.toml index b402923e7b..ed38d28f87 100644 --- a/mullvad-management-interface/Cargo.toml +++ b/mullvad-management-interface/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "mullvad-management-interface" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Mullvad VPN IPC. Contains types and functions for IPC clients and servers." -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] chrono = { version = "0.4.26" } diff --git a/mullvad-nsis/Cargo.toml b/mullvad-nsis/Cargo.toml index f31378f5c5..7bf430b208 100644 --- a/mullvad-nsis/Cargo.toml +++ b/mullvad-nsis/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "mullvad-nsis" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Helper library used by Mullvad NSIS plugins" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [lib] crate_type = ["staticlib"] diff --git a/mullvad-paths/Cargo.toml b/mullvad-paths/Cargo.toml index e1e8fae8e0..2a1662bd38 100644 --- a/mullvad-paths/Cargo.toml +++ b/mullvad-paths/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "mullvad-paths" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Mullvad VPN application paths and directories" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] err-derive = "0.3.1" diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml index 5992b4570f..b920097eda 100644 --- a/mullvad-problem-report/Cargo.toml +++ b/mullvad-problem-report/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "mullvad-problem-report" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Collect Mullvad VPN logs into a report and send it to support" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] dirs-next = "2.0" diff --git a/mullvad-relay-selector/Cargo.toml b/mullvad-relay-selector/Cargo.toml index 18718d16dc..f62a6a6a54 100644 --- a/mullvad-relay-selector/Cargo.toml +++ b/mullvad-relay-selector/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "mullvad-relay-selector" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Mullvad VPN relay selector" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] chrono = "0.4.21" diff --git a/mullvad-setup/Cargo.toml b/mullvad-setup/Cargo.toml index 651dac4aaf..b122deb235 100644 --- a/mullvad-setup/Cargo.toml +++ b/mullvad-setup/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "mullvad-setup" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Tool used to manage daemon setup" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [[bin]] name = "mullvad-setup" diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml index abc182383c..8cce30412c 100644 --- a/mullvad-types/Cargo.toml +++ b/mullvad-types/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "mullvad-types" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Common base data structures for Mullvad VPN client" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] chrono = { version = "0.4.26", features = ["serde"] } diff --git a/mullvad-version/Cargo.toml b/mullvad-version/Cargo.toml index 52cd27388b..87a1b5df68 100644 --- a/mullvad-version/Cargo.toml +++ b/mullvad-version/Cargo.toml @@ -1,17 +1,18 @@ [package] name = "mullvad-version" -version = "0.0.0" -authors = ["Mullvad VPN"] -license = "GPL-3.0" -edition = "2021" -publish = false - description = """ Computes the Mullvad VPN app product version. This crate is the single source of truth for what version string a build should have. This crate is responsible for computing the `-dev-$git_hash` suffix as well as transforming the version into semver, Android versionCode and other formats. """ +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true + [target.'cfg(not(target_os="android"))'.dependencies] regex = "1.6.0" diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index 69059493e0..e62da78dcf 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "talpid-core" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Privacy preserving and secure VPN client library" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] bitflags = "1.2" diff --git a/talpid-dbus/Cargo.toml b/talpid-dbus/Cargo.toml index 4686ffabfc..cb4439ec9f 100644 --- a/talpid-dbus/Cargo.toml +++ b/talpid-dbus/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "talpid-dbus" -version = "0.0.0" -authors = ["Mullvad VPN"] -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [target.'cfg(target_os = "linux")'.dependencies] dbus = "0.9" diff --git a/talpid-openvpn-plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml index 283d5a826f..d18511889f 100644 --- a/talpid-openvpn-plugin/Cargo.toml +++ b/talpid-openvpn-plugin/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "talpid-openvpn-plugin" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [lib] crate-type = ["cdylib"] diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml index a1d8a44645..71ab1c218d 100644 --- a/talpid-openvpn/Cargo.toml +++ b/talpid-openvpn/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "talpid-openvpn" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Library for creating OpenVPN tunnels" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] diff --git a/talpid-platform-metadata/Cargo.toml b/talpid-platform-metadata/Cargo.toml index 6ae3aa9852..c3c6dcd746 100644 --- a/talpid-platform-metadata/Cargo.toml +++ b/talpid-platform-metadata/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "talpid-platform-metadata" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Platform metadata detection functions" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [target.'cfg(target_os = "linux")'.dependencies] diff --git a/talpid-routing/Cargo.toml b/talpid-routing/Cargo.toml index 27ffccce2b..eda64c029b 100644 --- a/talpid-routing/Cargo.toml +++ b/talpid-routing/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "talpid-routing" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Library for managing routing tables" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] diff --git a/talpid-time/Cargo.toml b/talpid-time/Cargo.toml index 73f7a25977..c8ebca968b 100644 --- a/talpid-time/Cargo.toml +++ b/talpid-time/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "talpid-time" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Time functions" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] tokio = { version = "1.8", features = ["time"] } diff --git a/talpid-tunnel-config-client/Cargo.toml b/talpid-tunnel-config-client/Cargo.toml index 0f39c4d1ea..6a6140513e 100644 --- a/talpid-tunnel-config-client/Cargo.toml +++ b/talpid-tunnel-config-client/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "talpid-tunnel-config-client" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Uses the relay RPC service to set up PQ-safe peers, etc." -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] log = "0.4" diff --git a/talpid-tunnel/Cargo.toml b/talpid-tunnel/Cargo.toml index 7a8fcf04cd..d2314a86c2 100644 --- a/talpid-tunnel/Cargo.toml +++ b/talpid-tunnel/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "talpid-tunnel" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Library for creating tunnel devices and interfacing with various VPN tunnels" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] err-derive = "0.3.1" diff --git a/talpid-types/Cargo.toml b/talpid-types/Cargo.toml index 99c6d73f86..6929e61fa2 100644 --- a/talpid-types/Cargo.toml +++ b/talpid-types/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "talpid-types" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Common base structures for talpid" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] serde = { version = "1.0", features = ["derive"] } diff --git a/talpid-windows-net/Cargo.toml b/talpid-windows-net/Cargo.toml index ebf233741e..165f3787bc 100644 --- a/talpid-windows-net/Cargo.toml +++ b/talpid-windows-net/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "talpid-windows-net" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Work with Windows network interfaces and their configuration" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [target.'cfg(windows)'.dependencies] err-derive = "0.3.1" diff --git a/talpid-wireguard/Cargo.toml b/talpid-wireguard/Cargo.toml index 0d13792190..e7e3d77e22 100644 --- a/talpid-wireguard/Cargo.toml +++ b/talpid-wireguard/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "talpid-wireguard" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Library for creating various WireGuard tunnels" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] diff --git a/tunnel-obfuscation/Cargo.toml b/tunnel-obfuscation/Cargo.toml index 71986379cf..d3aa56fbcd 100644 --- a/tunnel-obfuscation/Cargo.toml +++ b/tunnel-obfuscation/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "tunnel-obfuscation" -version = "0.0.0" -authors = ["Mullvad VPN"] description = "Provides different types of obfuscation layers for WireGuard" -license = "GPL-3.0" -edition = "2021" -publish = false +version.workspace = true +authors.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true +publish.workspace = true [dependencies] async-trait = "0.1" |
