Skip to content

Commit

Permalink
Merge pull request #81 from rememberber/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@rememberber
rememberber authored Sep 3, 2023
2 parents 6ae155e + aa44190 commit aca8cf3
Show file tree
Hide file tree
Showing 17 changed files with 1,377 additions and 192 deletions.
6 changes: 3 additions & 3 deletions download_links.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"windows": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.1/MooTool-1.5.1-windows.exe",
"mac": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.1/MooTool_1.5.1.dmg",
"linux": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.1/MooTool_1.5.1.deb"
"windows": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.2/MooTool-1.5.2-windows.exe",
"mac": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.2/MooTool_1.5.2.dmg",
"linux": "https://gitee.com/zhoubochina/MooTool/releases/download/v1.5.2/MooTool_1.5.2.deb"
}
108 changes: 60 additions & 48 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.luoboduner.moo.tool</groupId>
<artifactId>MooTool</artifactId>
<version>1.5.2</version>
<version>1.5.3</version>
<packaging>jar</packaging>

<name>MooTool</name>
Expand Down Expand Up @@ -40,6 +40,7 @@
<sql-formatter.version>2.0.3</sql-formatter.version>
<google-java-format.version>1.16.0</google-java-format.version>
<jSystemThemeDetector.version>3.8</jSystemThemeDetector.version>
<cron-utils.version>9.2.1</cron-utils.version>
</properties>

<repositories>
Expand Down Expand Up @@ -226,6 +227,12 @@
<version>3.0.9</version>
</dependency>

<dependency>
<groupId>com.cronutils</groupId>
<artifactId>cron-utils</artifactId>
<version>${cron-utils.version}</version>
</dependency>

</dependencies>

<build>
Expand All @@ -249,41 +256,46 @@
<mainClass>com.luoboduner.moo.tool.App</mainClass>
<generateInstaller>true</generateInstaller>
<!-- 这行不能被格式化为多行，否则会出错-->
<vmArgs>--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</vmArgs>
<vmArgs>--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports
jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports
jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports
jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports
jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
</vmArgs>
</configuration>
<executions>
<!-- <execution>-->
<!-- <id>bundling-for-windows</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>package</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <platform>windows</platform>-->
<!-- <createZipball>true</createZipball>-->
<!-- <customizedJre>false</customizedJre>-->
<!-- <additionalModules>jdk.crypto.ec,jdk.charsets,com.jthemedetector</additionalModules>-->
<!-- <administratorRequired>true</administratorRequired>-->
<!-- <winConfig>-->

<!-- &lt;!&ndash; general properties &ndash;&gt;-->
<!-- <generateSetup>true</generateSetup>-->
<!-- <generateMsi>true</generateMsi>-->
<!-- <generateMsm>true</generateMsm>-->

<!-- &lt;!&ndash; setup generation properties &ndash;&gt;-->
<!-- <setupMode>installForAllUsers</setupMode>-->
<!-- <createDesktopIconTask>true</createDesktopIconTask>-->
<!-- <disableDirPage>false</disableDirPage>-->
<!-- <disableFinishedPage>false</disableFinishedPage>-->
<!-- <removeOldLibs>true</removeOldLibs>-->
<!-- <setupLanguages>-->
<!-- <english>compiler:Default.isl</english>-->
<!-- &lt;!&ndash; <spanish>compiler:Languages\Chinese.isl</spanish>&ndash;&gt;-->
<!-- </setupLanguages>-->
<!-- </winConfig>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>bundling-for-windows</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>package</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <platform>windows</platform>-->
<!-- <createZipball>true</createZipball>-->
<!-- <customizedJre>false</customizedJre>-->
<!-- <additionalModules>jdk.crypto.ec,jdk.charsets,com.jthemedetector</additionalModules>-->
<!-- <administratorRequired>true</administratorRequired>-->
<!-- <winConfig>-->

<!-- &lt;!&ndash; general properties &ndash;&gt;-->
<!-- <generateSetup>true</generateSetup>-->
<!-- <generateMsi>true</generateMsi>-->
<!-- <generateMsm>true</generateMsm>-->

<!-- &lt;!&ndash; setup generation properties &ndash;&gt;-->
<!-- <setupMode>installForAllUsers</setupMode>-->
<!-- <createDesktopIconTask>true</createDesktopIconTask>-->
<!-- <disableDirPage>false</disableDirPage>-->
<!-- <disableFinishedPage>false</disableFinishedPage>-->
<!-- <removeOldLibs>true</removeOldLibs>-->
<!-- <setupLanguages>-->
<!-- <english>compiler:Default.isl</english>-->
<!-- &lt;!&ndash; <spanish>compiler:Languages\Chinese.isl</spanish>&ndash;&gt;-->
<!-- </setupLanguages>-->
<!-- </winConfig>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- <execution>-->
<!-- <id>bundling-for-linux</id>-->
<!-- <phase>package</phase>-->
Expand All @@ -293,23 +305,23 @@
<!-- <configuration>-->
<!-- <platform>linux</platform>-->
<!-- <createTarball>true</createTarball>-->
<!-- <customizedJre>false</customizedJre>-->
<!-- <customizedJre>false</customizedJre>-->
<!-- <additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>-->
<!-- </configuration>-->
<!-- </execution>-->
<execution>
<id>bundling-for-mac</id>
<phase>package</phase>
<goals>
<goal>package</goal>
</goals>
<configuration>
<platform>mac</platform>
<customizedJre>false</customizedJre>
<createTarball>true</createTarball>
<additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>
</configuration>
</execution>
<execution>
<id>bundling-for-mac</id>
<phase>package</phase>
<goals>
<goal>package</goal>
</goals>
<configuration>
<platform>mac</platform>
<customizedJre>false</customizedJre>
<createTarball>true</createTarball>
<additionalModules>jdk.crypto.ec,jdk.charsets</additionalModules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/luoboduner/moo/tool/ui/UiConsts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class UiConsts {
* 软件名称,版本
*/
public static final String APP_NAME = "MooTool";
public static final String APP_VERSION = "v1.5.2";
public static final String APP_VERSION = "v1.5.3";

public static final int TABLE_ROW_HEIGHT = 30;

Expand Down
Loading

0 comments on commit aca8cf3

Please sign in to comment.