fix: versionBuild use override if present

Cap-go · May 12, 2023 · eccc8a6 · eccc8a6
1 parent 841ec18
commit eccc8a6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java b/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java
@@ -106,7 +106,8 @@ public void notifyListeners(final String id, final JSObject res) {
           .getPackageManager()
           .getPackageInfo(this.getContext().getPackageName(), 0);
       this.implementation.activity = this.getActivity();
-      this.implementation.versionBuild = pInfo.versionName;
+      this.implementation.versionBuild =
+        this.getConfig().getString("version", pInfo.versionName);
       this.implementation.PLUGIN_VERSION = this.PLUGIN_VERSION;
       this.implementation.versionCode = Integer.toString(pInfo.versionCode);
       this.implementation.requestQueue =

diff --git a/ios/Plugin/CapacitorUpdater.swift b/ios/Plugin/CapacitorUpdater.swift
@@ -219,7 +219,6 @@ extension CustomError: LocalizedError {
 
 @objc public class CapacitorUpdater: NSObject {
 
-    private let versionName: String = Bundle.main.versionName ?? ""
     private let versionCode: String = Bundle.main.versionCode ?? ""
     private let versionOs = UIDevice.current.systemVersion
     private let documentsDir: URL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
@@ -233,6 +232,7 @@ extension CustomError: LocalizedError {
 
     public let TAG: String = "✨  Capacitor-updater:"
     public let CAP_SERVER_PATH: String = "serverBasePath"
+    public var versionName: String = ""
     public var customId: String = ""
     public var PLUGIN_VERSION: String = ""
     public let timeout: Double = 20

diff --git a/ios/Plugin/CapacitorUpdaterPlugin.swift b/ios/Plugin/CapacitorUpdaterPlugin.swift
@@ -41,6 +41,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         } catch {
             print("\(self.implementation.TAG) Cannot get version native \(currentVersionNative)")
         }
+        implementation.versionName = getConfig().getString("version", Bundle.main.versionName)!
         autoDeleteFailed = getConfig().getBoolean("autoDeleteFailed", true)
         autoDeletePrevious = getConfig().getBoolean("autoDeletePrevious", true)
         updateUrl = getConfig().getString("updateUrl", CapacitorUpdaterPlugin.updateUrlDefault)!