feat: Synchronize bundleVersion with Info.plist

Author: velocitysystems

.changes/ios-macos-bundleversion.md

@@ -0,0 +1,5 @@
+---
+"tauri": minor:feat
+---
+
+Added `bundleVersion` to iOS and macOS configuration to support specifying a `CFBundleVersion`.

crates/tauri-bundler/src/bundle/macos/app.rs

@@ -220,7 +220,7 @@ fn create_info_plist(
     "CFBundleShortVersionString".into(),
     settings.version_string().into(),
   );
-  plist.insert("CFBundleVersion".into(), settings.bundle_version().unwrap_or_else(|| settings.version_string()).into());
+  plist.insert("CFBundleVersion".into(), settings.bundle_version().into());
   plist.insert("CSResourcesFileMapped".into(), true.into());
   if let Some(category) = settings.app_category() {
     plist.insert(

crates/tauri-bundler/src/bundle/macos/ios.rs

@@ -178,7 +178,7 @@ fn generate_info_plist(
   writeln!(
     file,
     "  <key>CFBundleVersion</key>\n  <string>{}</string>",
-    settings.bundle_version().unwrap_or_else(|| settings.version_string())
+    settings.bundle_version()
   )?;
   writeln!(
     file,

crates/tauri-bundler/src/bundle/settings.rs

@@ -146,6 +146,8 @@ pub struct PackageSettings {
   pub product_name: String,
   /// the package's version.
   pub version: String,
+  /// the package's bundle version.
+  pub bundle_version: String,
   /// the package's description.
   pub description: String,
   /// the package's homepage.
@@ -1105,15 +1107,8 @@ impl Settings {
   }
 
   /// Returns the bundle version.
-  pub fn bundle_version(&self) -> Option<&str> {
-    #[cfg(target_os = "ios")]
-    {
-      self.bundle_settings.ios.bundle_version.as_deref()
-    }
-    #[cfg(target_os = "macos")]
-    {
-      self.bundle_settings.macos.bundle_version.as_deref()
-    }
+  pub fn bundle_version(&self) -> &str {
+    &self.package.bundle_version
   }
 
   /// Returns the copyright text.

crates/tauri-cli/src/interface/rust.rs

@@ -22,7 +22,8 @@ use notify_debouncer_full::new_debouncer;
 use serde::{Deserialize, Deserializer};
 use tauri_bundler::{
   AppCategory, AppImageSettings, BundleBinary, BundleSettings, DebianSettings, DmgSettings,
-  IosSettings, MacOsSettings, PackageSettings, Position, RpmSettings, Size, UpdaterSettings, WindowsSettings,
+  IosSettings, MacOsSettings, PackageSettings, Position, RpmSettings, Size, UpdaterSettings,
+  WindowsSettings,
 };
 use tauri_utils::config::{parse::is_configuration_file, DeepLinkProtocol, Updater};
 
@@ -1016,24 +1017,35 @@ impl RustAppSettings {
       .workspace
       .and_then(|v| v.package);
 
+    let version = config.version.clone().unwrap_or_else(|| {
+      cargo_package_settings
+        .version
+        .clone()
+        .expect("Cargo manifest must have the `package.version` field")
+        .resolve("version", || {
+          ws_package_settings
+            .as_ref()
+            .and_then(|p| p.version.clone())
+            .ok_or_else(|| anyhow::anyhow!("Couldn't inherit value for `version` from workspace"))
+        })
+        .expect("Cargo project does not have a version")
+    });
+
+    let bundle_version = if cfg!(target_os = "ios") {
+      config.bundle.ios.bundle_version.clone()
+    } else if cfg!(target_os = "macos") {
+      config.bundle.macos.bundle_version.clone()
+    } else {
+      None
+    };
+
     let package_settings = PackageSettings {
       product_name: config
         .product_name
         .clone()
         .unwrap_or_else(|| cargo_package_settings.name.clone()),
-      version: config.version.clone().unwrap_or_else(|| {
-        cargo_package_settings
-          .version
-          .clone()
-          .expect("Cargo manifest must have the `package.version` field")
-          .resolve("version", || {
-            ws_package_settings
-              .as_ref()
-              .and_then(|p| p.version.clone())
-              .ok_or_else(|| anyhow::anyhow!("Couldn't inherit value for `version` from workspace"))
-          })
-          .expect("Cargo project does not have a version")
-      }),
+      version: version.clone(),
+      bundle_version: bundle_version.unwrap_or_else(|| version.clone()),
       description: cargo_package_settings
         .description
         .clone()

crates/tauri-cli/src/mobile/ios/build.rs

@@ -183,8 +183,12 @@ pub fn command(options: Options, noise_level: NoiseLevel) -> Result<()> {
 
   let mut plist = plist::Dictionary::new();
   let version = interface.app_settings().get_package_settings().version;
+  let bundle_version = interface
+    .app_settings()
+    .get_package_settings()
+    .bundle_version;
   plist.insert("CFBundleShortVersionString".into(), version.clone().into());
-  plist.insert("CFBundleVersion".into(), version.into());
+  plist.insert("CFBundleVersion".into(), bundle_version.into());
 
   let info_plist_path = config
     .project_dir()

crates/tauri-codegen/src/context.rs

@@ -315,7 +315,13 @@ pub fn context_codegen(data: ContextData) -> EmbeddedAssetsResult<TokenStream> {
       if let Some(version) = &config.version {
         let bundle_version = &config.bundle.macos.bundle_version;
         plist.insert("CFBundleShortVersionString".into(), version.clone().into());
-        plist.insert("CFBundleVersion".into(), bundle_version.clone().unwrap_or_else(|| version.clone()).into());
+        plist.insert(
+          "CFBundleVersion".into(),
+          bundle_version
+            .clone()
+            .unwrap_or_else(|| version.clone())
+            .into(),
+        );
       }
     }