Skip to content

Commit 4931cb2

Browse files
committed
1.修改打包脚本
1 parent 35b20a1 commit 4931cb2

8 files changed

Lines changed: 17 additions & 8 deletions

File tree

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
dependencies {
22
api project(':xcore')
3-
implementation 'org.apache.groovy:groovy-all:4.0.18'
4-
5-
implementation 'org.python:jython:2.5.3'
6-
implementation 'org.luaj:luaj-jse:3.0.1'
3+
api 'org.apache.groovy:groovy-all:4.0.21'
4+
api 'org.python:jython:2.5.3'
5+
api 'org.luaj:luaj-jse:3.0.1'
76
}
87

98
group = 'com.xwintop'
@@ -12,7 +11,10 @@ description = 'x-ScriptEngineTool'
1211

1312
//打jar包需要包含依赖的配置
1413
jar {
15-
from { configurations.compileClasspath.findAll { it.name.contains("groovy")
16-
||it.name.contains("luaj-jse")
14+
duplicatesStrategy = 'exclude'
15+
from { configurations.compileClasspath.findAll {
16+
it.name.contains("groovy")
17+
|| it.name.contains("jython")
18+
|| it.name.contains("luaj-jse")
1719
}.collect { zipTree(it) } }
1820
}

developTools/x-AsciiPicTool/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ description = 'x-AsciiPicTool'
1111

1212
//打jar包需要包含依赖的配置
1313
jar {
14-
from { configurations.compileClasspath.findAll { it.name.contains("thumbnailator")
14+
duplicatesStrategy = 'exclude'
15+
from { configurations.compileClasspath.findAll {
16+
it.name.contains("thumbnailator")
1517
|| it.name.contains("poi")
1618
|| it.name.contains("commons-imaging")
1719
}.collect { zipTree(it) } }

littleTools/x-ExcelSplitTool/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ description = 'x-ExcelSplitTool'
1010

1111
//打jar包需要包含依赖的配置
1212
jar {
13+
duplicatesStrategy = 'exclude'
1314
from { configurations.compileClasspath.findAll { it.name.contains("poi")
1415
|| it.name.contains("commons-csv")}.collect { zipTree(it) } }
1516
}

littleTools/x-FileMergeTool/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ description = 'x-FileMergeTool'
1010

1111
//打jar包需要包含依赖的配置
1212
jar {
13+
duplicatesStrategy = 'exclude'
1314
from { configurations.compileClasspath.findAll { it.name.contains("poi")
1415
|| it.name.contains("commons-csv")}.collect { zipTree(it) } }
1516
}

littleTools/x-FileSearchTool/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ description = 'x-FileSearchTool'
1010

1111
//打jar包需要包含依赖的配置
1212
jar {
13+
duplicatesStrategy = 'exclude'
1314
from { configurations.compileClasspath.findAll { it.name.contains("lucene")}.collect { zipTree(it) } }
1415
}

littleTools/x-ImageTool/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ description = 'x-ImageTool'
2121

2222
//打jar包需要包含依赖的配置
2323
jar {
24+
duplicatesStrategy = 'exclude'
2425
from { configurations.compileClasspath.findAll { it.name.contains("thumbnailator")
2526
|| it.name.contains("imageio")}.collect { zipTree(it) } }
2627
}

littleTools/x-JavaService/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ description = 'x-JavaService'
1010

1111
//打jar包需要包含依赖的配置
1212
jar {
13+
duplicatesStrategy = 'exclude'
1314
from { configurations.compileClasspath.findAll { it.name.contains("lucene")}.collect { zipTree(it) } }
1415
}

xJavaFxTool/src/main/java/com/xwintop/xJavaFxTool/services/index/PluginManageService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
@Setter
4141
@Slf4j
4242
public class PluginManageService {
43-
public static final String SERVER_PLUGINS_URL = "https://xwintop.gitee.io/maven/plugin-libs/plugin-list.json";
43+
public static final String SERVER_PLUGINS_URL = "http://qiniu.xwintop.com/xJavaFxTool/plugin-list.json";
4444

4545
private PluginManageController pluginManageController;
4646

0 commit comments

Comments
 (0)