Skip to content

Commit 76cafd0

Browse files
author
fxu
committed
chore(deps): 更新依赖库版本并调整项目配置
- 升级 gluonfx-gradle-plugin 版本从1.0.22 到 1.0.28 - 升级 beryx.runtime 版本从 1.13.1 到 2.0.0- 启用多个子项目依赖,包括 x-EncryptAndDecrypt、x-ImageTool 等- 注释掉 gluonfx 主类配置 - 升级 lombok 版本从1.18.38 到 1.18.42 - 升级 javafx 版本从 21.0.8 到 25.0.1 - 移除阿里云 Maven 仓库配置 - 更新 javafx 模块版本为 25.0.1
1 parent 8975d68 commit 76cafd0

5 files changed

Lines changed: 17 additions & 16 deletions

File tree

build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ plugins {
2121
subprojects {
2222
ext {
2323
springBootVersion = "2.7.18"
24-
lombokVersion = "1.18.38"
25-
javafxVersion = "21.0.8"
24+
lombokVersion = "1.18.42"
25+
javafxVersion = "25.0.1"
2626
}
2727
description 'xJavaFxTool'
2828
apply plugin: 'java'
@@ -35,10 +35,10 @@ subprojects {
3535
enabled = false
3636
}
3737
repositories {
38-
maven {
39-
allowInsecureProtocol = true
40-
url 'https://maven.aliyun.com/repository/public'
41-
}
38+
// maven {
39+
// allowInsecureProtocol = true
40+
// url 'https://maven.aliyun.com/repository/public'
41+
// }
4242
maven {
4343
allowInsecureProtocol = true
4444
url 'https://repo1.maven.org/maven2/'
@@ -67,7 +67,7 @@ subprojects {
6767
// api "org.openjfx:javafx-web:$javafxVersion"
6868
}
6969
javafx {
70-
version = "24.0.2"
70+
version = "25.0.1"
7171
modules = ['javafx.controls', "javafx.graphics", 'javafx.fxml', 'javafx.media', 'javafx.swing', 'javafx.web']
7272
// configuration = 'compileOnly'
7373
}

xJavaFxTool/build.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
//}
1414
plugins {
1515
// id "org.beryx.jlink" version "2.26.0"
16-
id 'org.beryx.runtime' version '1.13.1'
17-
id "com.gluonhq.gluonfx-gradle-plugin" version "1.0.22"
16+
id 'org.beryx.runtime' version '2.0.0'
17+
id "com.gluonhq.gluonfx-gradle-plugin" version "1.0.28"
1818
}
1919

2020
//apply plugin: 'jpro-gradle-plugin'
2121

2222
dependencies {
2323
api project(':xcore')
2424
// implementation "com.sandec.jpro:jpro-webapi:2024.2.1"
25-
// api project(":littleTools:x-EncryptAndDecrypt")
25+
api project(":littleTools:x-EncryptAndDecrypt")
2626
// api project(":littleTools:x-ZHConverter")
27-
// api project(":littleTools:x-ImageTool")
28-
// api project(":littleTools:x-IconTool")
27+
api project(":littleTools:x-ImageTool")
28+
api project(":littleTools:x-IconTool")
2929
// api project(":littleTools:x-PdfConvertTool")
3030
// api project(":littleTools:x-QRCodeBuilder")
3131
// api project(":littleTools:x-FileCopy")
@@ -35,7 +35,7 @@ dependencies {
3535
// api project(":littleTools:x-BookManageSystem")
3636
// api project(":littleTools:x-CoordinateTransformTool")
3737
// api project(":littleTools:x-ElementaryArithmeticProblemTool")
38-
// api project(":littleTools:x-CronExpBuilder")
38+
api project(":littleTools:x-CronExpBuilder")
3939
// api project(":littleTools:x-EmailTool")
4040
// api project(":littleTools:x-ExcelSplitTool")
4141
// api project(":littleTools:x-FileBuildTool")
@@ -59,15 +59,16 @@ dependencies {
5959
// api project(":debugTools:x-ActiveMqTool")
6060
// api project(":debugTools:x-ExpressionParserTool")
6161
// api project(":debugTools:x-FtpClientTool")
62-
// api project(":debugTools:x-FtpServer")
62+
api project(":debugTools:x-FtpServer")
63+
api project(":debugTools:x-SftpServer")
6364
// api project(":debugTools:x-HbaseTool")
6465
// api project(":debugTools:x-HttpTool")
6566
// api project(":debugTools:x-KafkaTool")
6667
//// api project(":debugTools:x-KeyTool")
6768
// api project(":debugTools:x-RedisTool")
6869
// api project(":debugTools:x-ScriptEngineTool")
6970
// api project(":debugTools:x-ZookeeperTool")
70-
// api project(":codeTools:x-RegexTester")
71+
api project(":codeTools:x-RegexTester")
7172
// api project(":codeTools:x-RandomGeneratorTool")
7273
// api project(":codeTools:x-IdCardGenerator")
7374
// api project(":codeTools:x-CharsetDetectTool")
@@ -205,7 +206,7 @@ runtime {
205206
//}
206207

207208
gluonfx {
208-
mainClassName = "com.xwintop.xJavaFxTool.XJavaFxToolMain"
209+
// mainClassName = "com.xwintop.xJavaFxTool.XJavaFxToolMain"
209210
}
210211

211212
//jpro {
1.44 MB
Binary file not shown.
83.9 KB
Binary file not shown.
8.07 KB
Loading

0 commit comments

Comments
 (0)