From 630ef1ab111c49bc89398dbfd8493c1f9fd179ef Mon Sep 17 00:00:00 2001 From: Steve Hannah Date: Sat, 5 Oct 2024 07:10:07 -0700 Subject: [PATCH] fixed versioning for dmg --- cli/src/main/java/ca/weblite/jdeploy/JDeploy.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cli/src/main/java/ca/weblite/jdeploy/JDeploy.java b/cli/src/main/java/ca/weblite/jdeploy/JDeploy.java index d50eddda..4895da50 100644 --- a/cli/src/main/java/ca/weblite/jdeploy/JDeploy.java +++ b/cli/src/main/java/ca/weblite/jdeploy/JDeploy.java @@ -1520,7 +1520,8 @@ private String fetchJdeployBundleCode(AppInfo appInfo) throws IOException { private void loadAppInfo(AppInfo appInfo) throws IOException { appInfo.setNpmPackage((String)m().get("name")); - appInfo.setNpmVersion(getString("version", "latest")); + String packageJsonVersion = m().get("version") != null ? m().get("version").toString() : "latest"; + appInfo.setNpmVersion(packageJsonVersion); if (isPackageSigningEnabled()) { try { appInfo.setEnableCertificatePinning(true); @@ -1760,7 +1761,7 @@ public BundlerResult bundle( appInfo.setNpmSource(bundlerSettings.getSource()); } - String packageJsonVersion = getString("version", "latest"); + String packageJsonVersion = m().getString("version"); if (bundlerSettings.getBundleVersion() != null) { appInfo.setNpmVersion(bundlerSettings.getBundleVersion()); } else if (bundlerSettings.isAutoUpdateEnabled() && !packageJsonVersion.startsWith("0.0.0-")) {