Remove version from pom.xml. Now using a single version number store in the main script class. Display the version number in the GUI & in the log.

Explv · Explv · commit 00d489e892fa · 2020-07-04T12:50:33.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,13 @@
 
     <groupId>org.explv.explv_osbot_manager</groupId>
     <artifactId>explvs_aio</artifactId>
-    <version>v3.1.12</version>
+
+    <!--
+        The version is declared in the main script class. We do not define a version here to avoid
+        having to update it in two places.
+    -->
+    <version>no-version</version>
+
     <repositories>
         <repository>
             <id>local-repo</id>
@@ -100,6 +106,7 @@
                             </descriptorRefs>
                             <appendAssemblyId>false</appendAssemblyId>
                             <outputDirectory>${user.home}/OSBot/Scripts/</outputDirectory>
+                            <finalName>explvs-aio</finalName>
                         </configuration>
                         <phase>package</phase>
                         <goals>
diff --git a/src/main/java/gui/Gui.java b/src/main/java/gui/Gui.java
@@ -6,6 +6,7 @@
 import gui.task_list.TaskList;
 import gui.utils.ColourScheme;
 import org.json.simple.JSONObject;
+import script.AIO;
 import tasks.Task;
 import tasks.TaskType;
 import util.file_managers.FontManager;
@@ -26,7 +27,7 @@ public class Gui {
 
     public Gui() {
         gui = new JDialog();
-        gui.setTitle("Explv's AIO");
+        gui.setTitle("Explv's AIO " + AIO.VERSION);
         gui.setModal(true);
         gui.setModalityType(Dialog.ModalityType.DOCUMENT_MODAL);
         gui.setBackground(ColourScheme.DIALOG_BACKGROUND_GREY);
@@ -39,7 +40,11 @@ public Gui() {
         titleLabel.setFont(FontManager.ROBOTO_REGULAR.deriveFont(Font.BOLD, 26));
         titleLabel.setForeground(ColourScheme.WHITE);
         titleLabel.setHorizontalAlignment(SwingConstants.CENTER);
-        titleLabel.setText("<html><span color='#33b5e5'>Explv</span>'s AIO</html>");
+        titleLabel.setText(
+                String.format("<html><span color='#33b5e5'>Explv</span>'s AIO <span style='font-size:16'>%s</span></html>",
+                        AIO.VERSION
+                )
+        );
         mainPanel.add(titleLabel, BorderLayout.NORTH);
 
         final JPanel controlsPanel = new StyledJPanel();
diff --git a/src/main/java/script/AIO.java b/src/main/java/script/AIO.java
@@ -28,7 +28,7 @@
 @ScriptManifest(author = "Explv", name = "Explv's AIO " + AIO.VERSION, info = "AIO", version = 0, logo = "http://i.imgur.com/58Zz0fb.png")
 public class AIO extends Script {
 
-    static final String VERSION = "v3.1.12";
+    public static final String VERSION = "v3.1.12";
 
     private Gui gui;
     private Paint paint;
@@ -40,16 +40,17 @@ public class AIO extends Script {
 
     @Override
     public void onStart() throws InterruptedException {
-        VersionChecker versionChecker = new VersionChecker(VERSION);
+        log("Current version: " + AIO.VERSION);
+        log("Latest version: " + VersionChecker.getLatestVersion().orElse("not found!"));
 
-        if (!versionChecker.updateIsIgnored() && !versionChecker.isUpToDate()) {
+        if (!VersionChecker.updateIsIgnored() && !VersionChecker.isUpToDate(AIO.VERSION)) {
             try {
                 EventDispatchThreadRunner.runOnDispatchThread(
                         () -> {
                             int selectedOption = NewVersionDialog.showNewVersionDialog(getBot().getBotPanel());
 
                             if (selectedOption == 0) {
-                                versionChecker.ignoreUpdate();
+                                VersionChecker.ignoreUpdate();
                             }
                         },
                         true
diff --git a/src/main/java/script/VersionChecker.java b/src/main/java/script/VersionChecker.java
@@ -17,15 +17,30 @@ public class VersionChecker {
     public static final String GITHUB_RELEASES_URL = "https://github.com/Explv/Explvs-AIO/releases/";
     private static final String GITHUB_API_LATEST_RELEASE_URL = "https://api.github.com/repos/Explv/Explvs-AIO/releases/latest";
 
-    private final String currentVersion;
-    private final String latestVersion;
+    private static String latestVersion;
 
-    public VersionChecker(final String currentVersion) {
-        this.currentVersion = currentVersion;
-        latestVersion = getLatestVersion().orElse(currentVersion);
+    public static Optional<String> getLatestVersion() {
+        if (latestVersion == null) {
+            latestVersion = getLatestVersionFromGitHub().orElse(null);
+        }
+
+        return Optional.ofNullable(latestVersion);
+    }
+
+    public static boolean updateIsIgnored() {
+        String ignoreUpdateScriptVerProp = ScriptProperties.getProperty(ScriptProperties.IGNORE_UPDATE_SCRIPT_VER);
+        return latestVersion.equals(ignoreUpdateScriptVerProp);
+    }
+
+    public static void ignoreUpdate() {
+        ScriptProperties.setProperty(ScriptProperties.IGNORE_UPDATE_SCRIPT_VER, latestVersion);
+    }
+
+    public static boolean isUpToDate(final String currentVersion) {
+        return currentVersion.equals(getLatestVersion().orElse(currentVersion));
     }
 
-    private static Optional<String> getLatestVersion() {
+    private static Optional<String> getLatestVersionFromGitHub() {
         Optional<String> latestGitHubReleaseTagOpt = getLatestGitHubReleaseTag();
 
         if (!latestGitHubReleaseTagOpt.isPresent()) {
@@ -65,17 +80,4 @@ private static Optional<JSONObject> getLatestGitHubReleaseJSON() {
         }
         return Optional.empty();
     }
-
-    public boolean updateIsIgnored() {
-        String ignoreUpdateScriptVerProp = ScriptProperties.getProperty(ScriptProperties.IGNORE_UPDATE_SCRIPT_VER);
-        return latestVersion.equals(ignoreUpdateScriptVerProp);
-    }
-
-    public void ignoreUpdate() {
-        ScriptProperties.setProperty(ScriptProperties.IGNORE_UPDATE_SCRIPT_VER, latestVersion);
-    }
-
-    public boolean isUpToDate() {
-        return currentVersion.equals(latestVersion);
-    }
 }
