feat: Use bundleVersion for CFBundleVersion

Author: velocitysystems

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

@@ -191,12 +191,6 @@ fn create_info_plist(
   bundle_icon_file: Option<PathBuf>,
   settings: &Settings,
 ) -> crate::Result<()> {
-  let format = time::format_description::parse("[year][month][day].[hour][minute][second]")
-    .map_err(time::error::Error::from)?;
-  let build_number = time::OffsetDateTime::now_utc()
-    .format(&format)
-    .map_err(time::error::Error::from)?;
-
   let mut plist = plist::Dictionary::new();
   plist.insert("CFBundleDevelopmentRegion".into(), "English".into());
   plist.insert("CFBundleDisplayName".into(), settings.product_name().into());
@@ -226,7 +220,7 @@ fn create_info_plist(
     "CFBundleShortVersionString".into(),
     settings.version_string().into(),
   );
-  plist.insert("CFBundleVersion".into(), build_number.into());
+  plist.insert("CFBundleVersion".into(), settings.bundle_version().unwrap_or_else(|| settings.version_string()).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.version_string()
+    settings.bundle_version().unwrap_or_else(|| settings.version_string())
   )?;
   writeln!(
     file,

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

@@ -1104,6 +1104,18 @@ impl Settings {
     &self.package.version
   }
 
+  /// 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()
+    }
+  }
+
   /// Returns the copyright text.
   pub fn copyright_string(&self) -> Option<&str> {
     self.bundle_settings.copyright.as_deref()

crates/tauri-codegen/src/context.rs

@@ -313,8 +313,9 @@ pub fn context_codegen(data: ContextData) -> EmbeddedAssetsResult<TokenStream> {
         plist.insert("CFBundleName".into(), product_name.clone().into());
       }
       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(), version.clone().into());
+        plist.insert("CFBundleVersion".into(), bundle_version.clone().unwrap_or_else(|| version.clone()).into());
       }
     }