diff options
| author | Emīls <emils@mullvad.net> | 2021-01-28 21:22:17 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2021-01-28 21:22:17 +0000 |
| commit | 77e2bd23662edbc5cff2c4c747fe75e80c726299 (patch) | |
| tree | 37d5a5b39f689b6db2ca17c0792c45fc7a7abd8f | |
| parent | e0b5655614cf2b65cffd136b22106e547b15fb7c (diff) | |
| download | mullvadvpn-77e2bd23662edbc5cff2c4c747fe75e80c726299.tar.xz mullvadvpn-77e2bd23662edbc5cff2c4c747fe75e80c726299.zip | |
Rename mullvad-platform-metadata
| -rw-r--r-- | Cargo.lock | 20 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/version_check.rs | 2 | ||||
| -rw-r--r-- | mullvad-problem-report/Cargo.toml | 2 | ||||
| -rw-r--r-- | mullvad-problem-report/src/metadata.rs | 4 | ||||
| -rw-r--r-- | talpid-platform-metadata/Cargo.toml (renamed from mullvad-platform-metadata/Cargo.toml) | 2 | ||||
| -rw-r--r-- | talpid-platform-metadata/src/android.rs (renamed from mullvad-platform-metadata/src/android.rs) | 0 | ||||
| -rw-r--r-- | talpid-platform-metadata/src/command.rs (renamed from mullvad-platform-metadata/src/command.rs) | 0 | ||||
| -rw-r--r-- | talpid-platform-metadata/src/lib.rs (renamed from mullvad-platform-metadata/src/lib.rs) | 0 | ||||
| -rw-r--r-- | talpid-platform-metadata/src/linux.rs (renamed from mullvad-platform-metadata/src/linux.rs) | 0 | ||||
| -rw-r--r-- | talpid-platform-metadata/src/macos.rs (renamed from mullvad-platform-metadata/src/macos.rs) | 0 | ||||
| -rw-r--r-- | talpid-platform-metadata/src/windows.rs (renamed from mullvad-platform-metadata/src/windows.rs) | 0 |
13 files changed, 17 insertions, 17 deletions
diff --git a/Cargo.lock b/Cargo.lock index e067e9cfb2..5745394850 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1243,7 +1243,6 @@ dependencies = [ "log-panics", "mullvad-management-interface", "mullvad-paths", - "mullvad-platform-metadata", "mullvad-rpc", "mullvad-types", "nix 0.19.0", @@ -1254,6 +1253,7 @@ dependencies = [ "serde_json", "simple-signal", "talpid-core", + "talpid-platform-metadata", "talpid-types", "tokio", "triggered", @@ -1322,14 +1322,6 @@ dependencies = [ ] [[package]] -name = "mullvad-platform-metadata" -version = "0.1.0" -dependencies = [ - "rs-release", - "talpid-dbus", -] - -[[package]] name = "mullvad-problem-report" version = "2021.1.0-beta1" dependencies = [ @@ -1340,9 +1332,9 @@ dependencies = [ "err-derive", "lazy_static", "mullvad-paths", - "mullvad-platform-metadata", "mullvad-rpc", "regex", + "talpid-platform-metadata", "talpid-types", "tokio", "uuid", @@ -2612,6 +2604,14 @@ dependencies = [ ] [[package]] +name = "talpid-platform-metadata" +version = "0.1.0" +dependencies = [ + "rs-release", + "talpid-dbus", +] + +[[package]] name = "talpid-types" version = "0.1.0" dependencies = [ diff --git a/Cargo.toml b/Cargo.toml index cd57754721..a2ac2f12cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,6 @@ members = [ "mullvad-problem-report", "mullvad-jni", "mullvad-paths", - "mullvad-platform-metadata", "mullvad-types", "mullvad-rpc", # "mullvad-tests", @@ -15,6 +14,7 @@ members = [ "talpid-openvpn-plugin", "talpid-core", "talpid-dbus", + "talpid-platform-metadata", "mullvad-management-interface", ] exclude = ["dist-assets/binaries/shadowsocks-rust"] diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index daee54b7bb..03dbd5951e 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -27,11 +27,11 @@ tokio = { version = "0.2", features = [ "fs", "rt-threaded", "stream", "sync" ] uuid = { version = "0.8", features = ["v4"] } mullvad-paths = { path = "../mullvad-paths" } -mullvad-platform-metadata = { path = "../mullvad-platform-metadata" } mullvad-types = { path = "../mullvad-types" } mullvad-rpc = { path = "../mullvad-rpc" } talpid-core = { path = "../talpid-core" } talpid-types = { path = "../talpid-types" } +talpid-platform-metadata = { path = "../talpid-platform-metadata" } [target.'cfg(not(target_os="android"))'.dependencies] triggered = "0.1.1" diff --git a/mullvad-daemon/src/version_check.rs b/mullvad-daemon/src/version_check.rs index acb2239d37..fbf5947b68 100644 --- a/mullvad-daemon/src/version_check.rs +++ b/mullvad-daemon/src/version_check.rs @@ -140,7 +140,7 @@ impl VersionUpdater { let version_proxy = AppVersionProxy::new(rpc_handle); let cache_path = cache_dir.join(VERSION_INFO_FILENAME); let (tx, rx) = mpsc::channel(1); - let platform_version = mullvad_platform_metadata::short_version(); + let platform_version = talpid_platform_metadata::short_version(); ( Self { diff --git a/mullvad-problem-report/Cargo.toml b/mullvad-problem-report/Cargo.toml index 8e415e0e71..c711994164 100644 --- a/mullvad-problem-report/Cargo.toml +++ b/mullvad-problem-report/Cargo.toml @@ -18,9 +18,9 @@ uuid = { version = "0.8", features = ["v4"] } tokio = { version = "0.2", features = [ "rt-core" ] } mullvad-paths = { path = "../mullvad-paths" } -mullvad-platform-metadata = { path = "../mullvad-platform-metadata" } mullvad-rpc = { path = "../mullvad-rpc" } talpid-types = { path = "../talpid-types" } +talpid-platform-metadata = { path = "../talpid-platform-metadata" } [target.'cfg(target_os = "android")'.dependencies] diff --git a/mullvad-problem-report/src/metadata.rs b/mullvad-problem-report/src/metadata.rs index 0d7eecfb47..ac4b8c9255 100644 --- a/mullvad-problem-report/src/metadata.rs +++ b/mullvad-problem-report/src/metadata.rs @@ -9,7 +9,7 @@ pub fn collect() -> BTreeMap<String, String> { "mullvad-product-version".to_owned(), PRODUCT_VERSION.to_owned(), ); - metadata.insert("os".to_owned(), mullvad_platform_metadata::version()); - metadata.extend(mullvad_platform_metadata::extra_metadata()); + metadata.insert("os".to_owned(), talpid_platform_metadata::version()); + metadata.extend(talpid_platform_metadata::extra_metadata()); metadata } diff --git a/mullvad-platform-metadata/Cargo.toml b/talpid-platform-metadata/Cargo.toml index fa33efb362..d922adf865 100644 --- a/mullvad-platform-metadata/Cargo.toml +++ b/talpid-platform-metadata/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "mullvad-platform-metadata" +name = "talpid-platform-metadata" version = "0.1.0" authors = ["Mullvad VPN"] description = "Platform metadata detection functions" diff --git a/mullvad-platform-metadata/src/android.rs b/talpid-platform-metadata/src/android.rs index 90d638772e..90d638772e 100644 --- a/mullvad-platform-metadata/src/android.rs +++ b/talpid-platform-metadata/src/android.rs diff --git a/mullvad-platform-metadata/src/command.rs b/talpid-platform-metadata/src/command.rs index 87ed6c40a0..87ed6c40a0 100644 --- a/mullvad-platform-metadata/src/command.rs +++ b/talpid-platform-metadata/src/command.rs diff --git a/mullvad-platform-metadata/src/lib.rs b/talpid-platform-metadata/src/lib.rs index f4ba78eaeb..f4ba78eaeb 100644 --- a/mullvad-platform-metadata/src/lib.rs +++ b/talpid-platform-metadata/src/lib.rs diff --git a/mullvad-platform-metadata/src/linux.rs b/talpid-platform-metadata/src/linux.rs index 016fb123c3..016fb123c3 100644 --- a/mullvad-platform-metadata/src/linux.rs +++ b/talpid-platform-metadata/src/linux.rs diff --git a/mullvad-platform-metadata/src/macos.rs b/talpid-platform-metadata/src/macos.rs index 9ee496adb1..9ee496adb1 100644 --- a/mullvad-platform-metadata/src/macos.rs +++ b/talpid-platform-metadata/src/macos.rs diff --git a/mullvad-platform-metadata/src/windows.rs b/talpid-platform-metadata/src/windows.rs index 41faf0099b..41faf0099b 100644 --- a/mullvad-platform-metadata/src/windows.rs +++ b/talpid-platform-metadata/src/windows.rs |
