Merge pull request #16 from rememberber/dev

release:1.1.2
rememberber · Mar 25, 2022 · dc02e10 · dc02e10
2 parents 1c3fc42 + ee5c72a
commit dc02e10
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.luoboduner.moo.info</groupId>
     <artifactId>MooInfo</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <packaging>jar</packaging>
 
     <name>MooInfo</name>
@@ -163,6 +163,7 @@
                                 <createDesktopIconTask>true</createDesktopIconTask>
                                 <disableDirPage>false</disableDirPage>
                                 <disableFinishedPage>false</disableFinishedPage>
+                                <removeOldLibs>true</removeOldLibs>
                                 <setupLanguages>
                                     <english>compiler:Default.isl</english>
                                     <!--                                    <spanish>compiler:Languages\Chinese.isl</spanish>-->

diff --git a/src/main/java/com/luoboduner/moo/info/ui/UiConsts.java b/src/main/java/com/luoboduner/moo/info/ui/UiConsts.java
@@ -11,7 +11,7 @@
 public class UiConsts {
 
     public static final String APP_NAME = "MooInfo";
-    public static final String APP_VERSION = "1.1.1";
+    public static final String APP_VERSION = "1.1.2";
 
     public static final int TABLE_ROW_HEIGHT = 36;
 

diff --git a/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.java b/src/main/java/com/luoboduner/moo/info/ui/dialog/SystemInfoTestDialog.java
@@ -38,17 +38,9 @@ public SystemInfoTestDialog() {
         setModal(true);
         getRootPane().setDefaultButton(buttonOK);
 
-        buttonOK.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                onOK();
-            }
-        });
+        buttonOK.addActionListener(e -> onOK());
 
-        buttonCancel.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                onCancel();
-            }
-        });
+        buttonCancel.addActionListener(e -> onCancel());
 
         // call onCancel() when cross is clicked
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
@@ -59,11 +51,7 @@ public void windowClosing(WindowEvent e) {
         });
 
         // call onCancel() on ESCAPE
-        contentPane.registerKeyboardAction(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                onCancel();
-            }
-        }, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+        contentPane.registerKeyboardAction(e -> onCancel(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
     }
 
     private void onOK() {

diff --git a/src/main/resources/version_summary.json b/src/main/resources/version_summary.json
@@ -1,10 +1,11 @@
 {
-  "currentVersion": "1.1.1",
+  "currentVersion": "1.1.2",
   "versionIndex": {
     "0.0.0": "0",
     "1.0.0": "1",
     "1.1.0": "2",
-    "1.1.1": "3"
+    "1.1.1": "3",
+    "1.1.2": "4"
   },
   "versionDetailList": [
     {
@@ -26,6 +27,11 @@
       "version": "1.1.1",
       "title": "update flatlaf to 2.0",
       "log": "● update flatlaf to 2.0\n● update oshi-core to 6.0.0\n● add battery wastage indicator\n● optimization of light theme\n"
+    },
+    {
+      "version": "1.1.2",
+      "title": "update flatlaf to 2.1",
+      "log": "● update flatlaf to 2.1\n● update oshi-core to 6.1.5\n● optimization of cpu indicator\n● update dependencies\n"
     }
   ]
 }