Adapt all crates to use mullvad-version

4 files changed, 12 insertions, 20 deletions

diff --git a/mullvad-daemon/src/cli.rs b/mullvad-daemon/src/cli.rs
index 22adf4427c..09412f4196 100644
--- a/mullvad-daemon/src/cli.rs
+++ b/mullvad-daemon/src/cli.rs
@@ -1,7 +1,5 @@
 use clap::{crate_authors, crate_description, crate_name, App, Arg};
 
-use crate::version;
-
 #[derive(Debug)]
 pub struct Config {
     pub log_level: log::LevelFilter,
@@ -72,7 +70,7 @@ lazy_static::lazy_static! {
 
 fn create_app() -> App<'static> {
     let mut app = App::new(crate_name!())
-        .version(version::PRODUCT_VERSION)
+        .version(mullvad_version::VERSION)
         .author(crate_authors!(", "))
         .about(crate_description!())
         .after_help(ENV_DESC.as_str())
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index 959e3222da..4f22c7244c 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -1498,7 +1498,7 @@ where
     fn on_get_current_version(&mut self, tx: oneshot::Sender<AppVersion>) {
         Self::oneshot_send(
             tx,
-            version::PRODUCT_VERSION.to_owned(),
+            mullvad_version::VERSION.to_owned(),
             "get_current_version response",
         );
     }
diff --git a/mullvad-daemon/src/version.rs b/mullvad-daemon/src/version.rs
index b80ea9d03e..19e6dfa134 100644
--- a/mullvad-daemon/src/version.rs
+++ b/mullvad-daemon/src/version.rs
@@ -1,18 +1,15 @@
-/// A string that identifies the current version of the application
-pub const PRODUCT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/product-version.txt"));
-
 /// Contains the date of the git commit this was built from
 pub const COMMIT_DATE: &str = include_str!(concat!(env!("OUT_DIR"), "/git-commit-date.txt"));
 
 pub fn is_beta_version() -> bool {
-    PRODUCT_VERSION.contains("beta")
+    mullvad_version::VERSION.contains("beta")
 }
 
 pub fn log_version() {
     log::info!(
         "Starting {} - {} {}",
         env!("CARGO_PKG_NAME"),
-        PRODUCT_VERSION,
+        mullvad_version::VERSION,
         COMMIT_DATE,
     )
 }
diff --git a/mullvad-daemon/src/version_check.rs b/mullvad-daemon/src/version_check.rs
index 4afa7ab44b..4c0271729b 100644
--- a/mullvad-daemon/src/version_check.rs
+++ b/mullvad-daemon/src/version_check.rs
@@ -1,7 +1,4 @@
-use crate::{
-    version::{is_beta_version, PRODUCT_VERSION},
-    DaemonEventSender,
-};
+use crate::{version::is_beta_version, DaemonEventSender};
 use futures::{
     channel::{mpsc, oneshot},
     stream::FusedStream,
@@ -24,7 +21,7 @@ use tokio::fs::{self, File};
 const VERSION_INFO_FILENAME: &str = "version-info.json";
 
 lazy_static::lazy_static! {
-    static ref APP_VERSION: ParsedAppVersion = ParsedAppVersion::from_str(PRODUCT_VERSION).unwrap();
+    static ref APP_VERSION: ParsedAppVersion = ParsedAppVersion::from_str(mullvad_version::VERSION).unwrap();
     static ref IS_DEV_BUILD: bool = APP_VERSION.is_dev();
 }
 
@@ -58,7 +55,7 @@ impl From<AppVersionInfo> for CachedAppVersionInfo {
     fn from(version_info: AppVersionInfo) -> CachedAppVersionInfo {
         CachedAppVersionInfo {
             version_info,
-            cached_from_version: PRODUCT_VERSION.to_owned(),
+            cached_from_version: mullvad_version::VERSION.to_owned(),
         }
     }
 }
@@ -190,7 +187,7 @@ impl VersionUpdater {
         let download_future_factory = move || {
             version_proxy
                 .version_check(
-                    PRODUCT_VERSION.to_owned(),
+                    mullvad_version::VERSION.to_owned(),
                     PLATFORM,
                     platform_version.clone(),
                 )
@@ -228,7 +225,7 @@ impl VersionUpdater {
         let download_future_factory = move || {
             let when_available = api_handle.wait_background();
             let request = version_proxy.version_check(
-                PRODUCT_VERSION.to_owned(),
+                mullvad_version::VERSION.to_owned(),
                 PLATFORM,
                 platform_version.clone(),
             );
@@ -450,7 +447,7 @@ async fn try_load_cache(cache_dir: &Path) -> Result<AppVersionInfo, Error> {
     let version_info: CachedAppVersionInfo =
         serde_json::from_str(&content).map_err(Error::Deserialize)?;
 
-    if version_info.cached_from_version == PRODUCT_VERSION {
+    if version_info.cached_from_version == mullvad_version::VERSION {
         Ok(version_info.version_info)
     } else {
         Err(Error::CacheVersionMismatch)
@@ -475,8 +472,8 @@ fn dev_version_cache() -> AppVersionInfo {
 
     AppVersionInfo {
         supported: false,
-        latest_stable: PRODUCT_VERSION.to_owned(),
-        latest_beta: PRODUCT_VERSION.to_owned(),
+        latest_stable: mullvad_version::VERSION.to_owned(),
+        latest_beta: mullvad_version::VERSION.to_owned(),
         suggested_upgrade: None,
         // Use WireGuard on 75% of dev builds. So we can manually modify
         // wg_migration_rand_num in the settings and verify that the migration