Release 1.3.0

Morph21 · Aug 19, 2022 · 2e489b6 · 2e489b6
1 parent 13b7682
commit 2e489b6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java b/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java
@@ -1,7 +1,7 @@
 package com.mercury.platform.core;
 
 public class MercuryConstants {
-    public static final String APP_VERSION = "1.2.9";
+    public static final String APP_VERSION = "1.3.0";
     public static final String SERVER_HOST = "exslims.ddns.net";
     public static final int PORT = 5555;
 }
diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/AbstractOverlaidFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/AbstractOverlaidFrame.java
@@ -2,6 +2,7 @@
 
 import com.mercury.platform.shared.AsSubscriber;
 import com.mercury.platform.shared.FrameVisibleState;
+import com.mercury.platform.shared.IconConst;
 import com.mercury.platform.shared.config.Configuration;
 import com.mercury.platform.shared.config.configration.FramesConfigurationService;
 import com.mercury.platform.shared.config.configration.KeyValueConfigurationService;
@@ -36,6 +37,7 @@ protected AbstractOverlaidFrame() {
             this.applicationConfig = Configuration.get().applicationConfiguration();
             this.scaleConfig = Configuration.get().scaleConfiguration();
         }
+        this.setIconImage(this.componentsFactory.getImage(IconConst.APP_ICON).getImage());
         this.getRootPane().setOpaque(false);
         this.setUndecorated(true);
         this.setLocationRelativeTo(null);

diff --git a/app-ui/src/main/resources/notes/patch/patch-notes-new.json b/app-ui/src/main/resources/notes/patch/patch-notes-new.json
@@ -1,4 +1,12 @@
 [
+  {
+    "version": "1.3.0",
+    "fix": [
+      {
+        "changed": "Icon in taskbar should look like MercuryTrade instead of java"
+      }
+    ]
+  },
   {
     "version": "1.2.9",
     "fix": [

diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
         <guava.version>29.0-jre</guava.version>
         <lombok.version>1.18.22</lombok.version>
         <expiringmap.version>0.5.9</expiringmap.version>
-        <rxjava.version>1.2.9</rxjava.version>
+        <rxjava.version>1.3.0</rxjava.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>

diff --git a/release_files/release_config.xml b/release_files/release_config.xml
@@ -30,12 +30,12 @@
     <opt>-XX:+UseG1GC</opt>
   </jre>
   <versionInfo>
-    <fileVersion>1.2.9.0</fileVersion>
-    <txtFileVersion>1.2.9</txtFileVersion>
+    <fileVersion>1.3.0.0</fileVersion>
+    <txtFileVersion>1.3.0</txtFileVersion>
     <fileDescription>MercuryTrade</fileDescription>
     <copyright>Morph21</copyright>
-    <productVersion>1.2.9.0</productVersion>
-    <txtProductVersion>1.2.9</txtProductVersion>
+    <productVersion>1.3.0.0</productVersion>
+    <txtProductVersion>1.3.0</txtProductVersion>
     <productName>MercuryTrade</productName>
     <companyName>Morph</companyName>
     <internalName>MercuryTrade</internalName>