Skip to content

Commit c6e5926

Browse files
xwintopxwintop
committed
1.修改依赖类
1 parent b82e141 commit c6e5926

4 files changed

Lines changed: 85 additions & 96 deletions

File tree

‎build.gradle‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ buildscript {
1212
}
1313

1414
plugins {
15-
// id 'application'
1615
id "org.gradlex.extra-java-module-info" version "1.7"
1716
id "org.beryx.jlink" version "2.26.0"
1817
id "org.openjfx.javafxplugin" version "0.1.0"
18+
id 'idea'
19+
id 'application'
20+
id 'maven-publish'
1921
}
2022
allprojects {
2123
ext {
@@ -27,7 +29,7 @@ allprojects {
2729
apply plugin: 'application'
2830
apply plugin: 'maven-publish' // 引入maven插件
2931
apply plugin: 'org.openjfx.javafxplugin'
30-
// sourceCompatibility = 17
32+
sourceCompatibility = 17
3133
test {//跳过测试
3234
enabled = false
3335
}
@@ -46,7 +48,7 @@ allprojects {
4648
}
4749
mavenCentral()
4850
}
49-
group = 'com.xwintop'
51+
// group = 'com.xwintop'
5052
// version = '0.0.0.1'
5153
[compileJava, compileTestJava, javadoc]*.options*.encoding = "UTF-8"
5254
dependencies {
@@ -71,12 +73,4 @@ allprojects {
7173
java {
7274
modularity.inferModulePath = true
7375
}
74-
}
75-
76-
//plugins {
77-
// id 'java'
78-
// id 'application'
79-
// id 'maven-publish'
80-
// id 'org.openjfx.javafxplugin' version '0.0.12'
81-
// id 'org.beryx.jlink' version '2.24.4'
82-
//}
76+
}

‎xJavaFxTool/build.gradle‎

Lines changed: 76 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -5,81 +5,79 @@ plugins {
55

66
dependencies {
77
api project(':xcore')
8-
api project(":littleTools:x-EncryptAndDecrypt")
9-
api project(":littleTools:x-ZHConverter")
10-
api project(":littleTools:x-ImageTool")
11-
api project(":littleTools:x-IconTool")
12-
api project(":littleTools:x-PdfConvertTool")
13-
api project(":littleTools:x-QRCodeBuilder")
14-
api project(":littleTools:x-FileCopy")
15-
api project(":littleTools:x-FileMergeTool")
16-
api project(":littleTools:x-TimeTool")
17-
api project(":littleTools:x-CharacterConverter")
18-
api project(":littleTools:x-BookManageSystem")
19-
api project(":littleTools:x-CoordinateTransformTool")
20-
api project(":littleTools:x-ElementaryArithmeticProblemTool")
21-
api project(":littleTools:x-CronExpBuilder")
22-
api project(":littleTools:x-EmailTool")
23-
api project(":littleTools:x-ExcelSplitTool")
24-
api project(":littleTools:x-FileBuildTool")
25-
api project(":littleTools:x-FileCompressTool")
26-
api project(":littleTools:x-FileRenameTool")
27-
api project(":littleTools:x-FileSearchTool")
28-
api project(":littleTools:x-HdfsTool")
29-
api project(":littleTools:x-ImageAnalysisTool")
30-
api project(":littleTools:x-JavaService")
31-
api project(":littleTools:x-LinuxPathToWindowsPath")
32-
api project(":littleTools:x-Mp3ConvertTool")
33-
api project(":littleTools:x-RelationshipCalculator")
34-
api project(":littleTools:x-SealBuilderTool")
35-
api project(":littleTools:x-SedentaryReminderTool")
36-
api project(":littleTools:x-SmsTool")
37-
api project(":debugTools:x-CmdTool")
38-
api project(":debugTools:x-ScanPortTool")
39-
api project(":debugTools:x-SwitchHostsTool")
40-
api project(":debugTools:x-SocketTool")
41-
api project(":debugTools:x-ActiveMqTool")
42-
api project(":debugTools:x-ExpressionParserTool")
43-
api project(":debugTools:x-FtpClientTool")
44-
api project(":debugTools:x-FtpServer")
45-
api project(":debugTools:x-HbaseTool")
46-
api project(":debugTools:x-HttpTool")
47-
api project(":debugTools:x-KafkaTool")
48-
api project(":debugTools:x-KeyTool")
49-
api project(":debugTools:x-RedisTool")
50-
api project(":debugTools:x-ScriptEngineTool")
51-
api project(":debugTools:x-ZookeeperTool")
52-
api project(":codeTools:x-RegexTester")
53-
api project(":codeTools:x-RandomGeneratorTool")
54-
api project(":codeTools:x-IdCardGenerator")
55-
api project(":codeTools:x-CharsetDetectTool")
56-
api project(":codeTools:x-ColorCodeConverterTool")
57-
api project(":codeTools:x-EscapeCharacter")
58-
api project(":codeTools:x-FileUnicodeTransformationTool")
59-
api project(":codeTools:x-WebSourcesTool")
60-
api project(":developTools:x-AsciiPicTool")
61-
api project(":developTools:x-JsonConvertTool")
62-
api project(":developTools:x-ClipboardHistoryTool")
63-
api project(":developTools:x-DirectoryTreeTool")
64-
api project(":developTools:x-LuytenTool")
65-
api project(":developTools:x-PathWatchTool")
66-
api project(":assistTools:x-TextToSpeechTool")
67-
api project(":assistTools:x-DecompilerWxApkgTool")
68-
api project(":assistTools:x-IdiomDataTool")
69-
api project(":assistTools:x-WechatJumpGameTool")
70-
api project(":games:x-X2048")
71-
api project(":games:x-BullsAndCowsGame")
72-
api project(":games:x-Sudoku")
73-
api project(":games:x-ChineseChess")
74-
api project(":games:x-SnakeJavaFx")
75-
api project(":games:x-pet")
76-
api project(":javaFxTools:x-JavaFxXmlToObjectCode")
77-
api project(":javaFxTools:x-ShowSystemInfo")
78-
api project(":webTools:x-ShortURL")
79-
api project(":netWorkTools:x-WebCronExpBuilder")
80-
api project(":netWorkTools:x-WebJsonEditor")
81-
// implementation 'io.github.classgraph:classgraph:4.8.100'
82-
// implementation 'com.gitee.xwintop:xcore:0.0.6-jdk17'
8+
// api project(":littleTools:x-EncryptAndDecrypt")
9+
// api project(":littleTools:x-ZHConverter")
10+
// api project(":littleTools:x-ImageTool")
11+
// api project(":littleTools:x-IconTool")
12+
// api project(":littleTools:x-PdfConvertTool")
13+
// api project(":littleTools:x-QRCodeBuilder")
14+
// api project(":littleTools:x-FileCopy")
15+
// api project(":littleTools:x-FileMergeTool")
16+
// api project(":littleTools:x-TimeTool")
17+
// api project(":littleTools:x-CharacterConverter")
18+
// api project(":littleTools:x-BookManageSystem")
19+
// api project(":littleTools:x-CoordinateTransformTool")
20+
// api project(":littleTools:x-ElementaryArithmeticProblemTool")
21+
// api project(":littleTools:x-CronExpBuilder")
22+
// api project(":littleTools:x-EmailTool")
23+
// api project(":littleTools:x-ExcelSplitTool")
24+
// api project(":littleTools:x-FileBuildTool")
25+
// api project(":littleTools:x-FileCompressTool")
26+
// api project(":littleTools:x-FileRenameTool")
27+
// api project(":littleTools:x-FileSearchTool")
28+
// api project(":littleTools:x-HdfsTool")
29+
// api project(":littleTools:x-ImageAnalysisTool")
30+
// api project(":littleTools:x-JavaService")
31+
// api project(":littleTools:x-LinuxPathToWindowsPath")
32+
// api project(":littleTools:x-Mp3ConvertTool")
33+
// api project(":littleTools:x-RelationshipCalculator")
34+
// api project(":littleTools:x-SealBuilderTool")
35+
// api project(":littleTools:x-SedentaryReminderTool")
36+
// api project(":littleTools:x-SmsTool")
37+
// api project(":debugTools:x-CmdTool")
38+
// api project(":debugTools:x-ScanPortTool")
39+
// api project(":debugTools:x-SwitchHostsTool")
40+
// api project(":debugTools:x-SocketTool")
41+
// api project(":debugTools:x-ActiveMqTool")
42+
// api project(":debugTools:x-ExpressionParserTool")
43+
// api project(":debugTools:x-FtpClientTool")
44+
// api project(":debugTools:x-FtpServer")
45+
// api project(":debugTools:x-HbaseTool")
46+
// api project(":debugTools:x-HttpTool")
47+
// api project(":debugTools:x-KafkaTool")
48+
//// api project(":debugTools:x-KeyTool")
49+
// api project(":debugTools:x-RedisTool")
50+
// api project(":debugTools:x-ScriptEngineTool")
51+
// api project(":debugTools:x-ZookeeperTool")
52+
// api project(":codeTools:x-RegexTester")
53+
// api project(":codeTools:x-RandomGeneratorTool")
54+
// api project(":codeTools:x-IdCardGenerator")
55+
// api project(":codeTools:x-CharsetDetectTool")
56+
// api project(":codeTools:x-ColorCodeConverterTool")
57+
// api project(":codeTools:x-EscapeCharacter")
58+
// api project(":codeTools:x-FileUnicodeTransformationTool")
59+
// api project(":codeTools:x-WebSourcesTool")
60+
// api project(":developTools:x-AsciiPicTool")
61+
// api project(":developTools:x-JsonConvertTool")
62+
// api project(":developTools:x-ClipboardHistoryTool")
63+
// api project(":developTools:x-DirectoryTreeTool")
64+
// api project(":developTools:x-LuytenTool")
65+
// api project(":developTools:x-PathWatchTool")
66+
// api project(":assistTools:x-TextToSpeechTool")
67+
// api project(":assistTools:x-DecompilerWxApkgTool")
68+
// api project(":assistTools:x-IdiomDataTool")
69+
// api project(":assistTools:x-WechatJumpGameTool")
70+
// api project(":games:x-X2048")
71+
// api project(":games:x-BullsAndCowsGame")
72+
// api project(":games:x-Sudoku")
73+
// api project(":games:x-ChineseChess")
74+
// api project(":games:x-SnakeJavaFx")
75+
// api project(":games:x-pet")
76+
// api project(":javaFxTools:x-JavaFxXmlToObjectCode")
77+
// api project(":javaFxTools:x-ShowSystemInfo")
78+
// api project(":webTools:x-ShortURL")
79+
// api project(":netWorkTools:x-WebCronExpBuilder")
80+
// api project(":netWorkTools:x-WebJsonEditor")
8381
}
8482

8583
group = 'com.xwintop'
@@ -108,12 +106,12 @@ application {
108106
jlink {
109107
mergedModule {
110108
requires 'java.naming'
111-
requires 'java.xml'
109+
// requires 'java.xml'
112110
}
113-
addExtraDependencies("javax.servlet")
111+
addExtraDependencies("javafx")
114112
launcher {
115113
name = 'xJavaFxTool'
116-
// mainClassName = 'com.xwintop.xJavaFxTool.XJavaFxToolMain'
114+
mainClassName = 'com.xwintop.xJavaFxTool.XJavaFxToolMain'
117115
jvmArgs = ['-Dlogback.configurationFile=./logback.xml']
118116
}
119117
}

‎xJavaFxTool/src/main/java/module-info.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010

1111
requires com.xwintop.xcore;
1212
requires java.sql;
13-
requires java.xml;
14-
// requires io.github.classgraph;
15-
// requires okio;
1613
requires ch.qos.logback.classic;
1714
requires ch.qos.logback.core;
1815
}

‎xcore/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ compileJava {
2424
options.compilerArgs += ['--module-path', classpath.asPath]
2525
}
2626

27-
extraJavaModuleInfo {
27+
//extraJavaModuleInfo {
2828
// module('quartz-2.3.2.jar','quartz','2.3.2')
2929
// module('jaxen-1.2.0.jar','jaxen','1.2.0')
3030
// module('commons-configuration-1.10.jar','commons-configuration','1.10')
@@ -34,8 +34,8 @@ extraJavaModuleInfo {
3434
// module('c3p0-0.9.5.4.jar','c3p0','0.9.5.4')
3535
// module('mchange-commons-java-0.2.15.jar','mchange-commons-java','0.2.15')
3636
// module('dom4j-2.1.3.jar','dom4j','2.1.3')
37-
deriveAutomaticModuleNamesFromFileNames.set(true)
38-
}
37+
// deriveAutomaticModuleNamesFromFileNames.set(true)
38+
//}
3939

4040
publishing {
4141
publications {

0 commit comments

Comments
 (0)