Skip to content

Commit f4c2175

Browse files
xwintopxwintop
committed
1.升级相关依赖包版本
1 parent a1ed274 commit f4c2175

7 files changed

Lines changed: 78 additions & 77 deletions

File tree

‎build.gradle‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//}
1313

1414
plugins {
15-
id "org.gradlex.extra-java-module-info" version "1.7"
15+
// id "org.gradlex.extra-java-module-info" version "1.7"
1616
id "org.openjfx.javafxplugin" version "0.1.0"
1717
id 'idea'
1818
id 'application'
@@ -22,6 +22,7 @@ subprojects {
2222
ext {
2323
springBootVersion = "2.7.18"
2424
lombokVersion = "1.18.32"
25+
javafxVersion = "21.0.3"
2526
}
2627
description 'xJavaFxTool'
2728
apply plugin: 'java'
@@ -57,20 +58,20 @@ subprojects {
5758
annotationProcessor "org.projectlombok:lombok:$lombokVersion"
5859
testCompileOnly "org.projectlombok:lombok:$lombokVersion"
5960
testAnnotationProcessor "org.projectlombok:lombok:$lombokVersion"
60-
// api 'org.openjfx:javafx-controls:21.0.2'
61-
// api 'org.openjfx:javafx-base:21.0.2'
62-
// api 'org.openjfx:javafx-graphics:21.0.2'
63-
// api 'org.openjfx:javafx-fxml:21.0.2'
64-
// api 'org.openjfx:javafx-swing:21.0.2'
65-
// api 'org.openjfx:javafx-media:21.0.2'
66-
// api 'org.openjfx:javafx-web:21.0.2'
61+
// api "org.openjfx:javafx-controls:$javafxVersion"
62+
// api "org.openjfx:javafx-base:$javafxVersion"
63+
// api "org.openjfx:javafx-graphics:$javafxVersion"
64+
// api "org.openjfx:javafx-fxml:$javafxVersion"
65+
// api "org.openjfx:javafx-swing:$javafxVersion"
66+
// api "org.openjfx:javafx-media:$javafxVersion"
67+
// api "org.openjfx:javafx-web:$javafxVersion"
6768
}
6869
javafx {
69-
version = "22.0.1"
70+
version = "21.0.3"
7071
modules = ['javafx.controls', "javafx.graphics", 'javafx.fxml', 'javafx.media', 'javafx.swing', 'javafx.web']
7172
// configuration = 'compileOnly'
7273
}
73-
java {
74-
modularity.inferModulePath = true
75-
}
74+
// java {
75+
// modularity.inferModulePath = true
76+
// }
7677
}

‎xJavaFxTool/build.gradle‎

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
buildscript {
2-
repositories {
3-
mavenCentral()
4-
maven {
5-
allowInsecureProtocol = true
6-
url "https://sandec.jfrog.io/artifactory/repo"
7-
}
8-
}
9-
10-
dependencies {
11-
classpath "one.jpro:jpro-gradle-plugin:2024.2.1"
12-
}
13-
}
1+
//buildscript {
2+
// repositories {
3+
// mavenCentral()
4+
// maven {
5+
// allowInsecureProtocol = true
6+
// url "https://sandec.jfrog.io/artifactory/repo"
7+
// }
8+
// }
9+
//
10+
// dependencies {
11+
// classpath "one.jpro:jpro-gradle-plugin:2024.2.1"
12+
// }
13+
//}
1414
plugins {
1515
// id "org.beryx.jlink" version "2.26.0"
16-
id 'org.beryx.runtime' version '1.12.7'
16+
id 'org.beryx.runtime' version '1.13.1'
1717
id "com.gluonhq.gluonfx-gradle-plugin" version "1.0.22"
1818
}
1919

20-
apply plugin: 'jpro-gradle-plugin'
20+
//apply plugin: 'jpro-gradle-plugin'
2121

2222
dependencies {
2323
api project(':xcore')
24-
implementation "com.sandec.jpro:jpro-webapi:2024.2.1"
24+
// implementation "com.sandec.jpro:jpro-webapi:2024.2.1"
2525
api project(":littleTools:x-EncryptAndDecrypt")
2626
// api project(":littleTools:x-ZHConverter")
2727
// api project(":littleTools:x-ImageTool")
@@ -107,24 +107,24 @@ compileJava {
107107

108108
application {
109109
applicationName = "xJavaFxTool"
110-
mainModule.set("com.xwintop.xJavaFxTool")
111-
mainClass.set("com.xwintop.xJavaFxTool.XJavaFxToolApplication")
112-
applicationDefaultJvmArgs = [
113-
// ZGC
114-
"-XX:+UseZGC",
115-
// 当遇到空指针异常时显示更详细的信息
116-
"-XX:+ShowCodeDetailsInExceptionMessages",
117-
"-Dsun.java2d.opengl=true",
118-
// 不添加此参数，打包成exe后，https协议的网络图片资源无法加载
119-
"-Dhttps.protocols=TLSv1.1,TLSv1.2",
120-
'--add-exports=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED',
121-
'--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED',
122-
'--add-exports=javafx.graphics/com.sun.javafx.util=ALL-UNNAMED',
123-
'--add-exports=javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED',
124-
'--add-exports=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED',
125-
'--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED',
126-
'--add-opens=java.base/java.lang.reflect=ALL-UNNAMED'
127-
]
110+
mainClass = "com.xwintop.xJavaFxTool.XJavaFxToolMain"
111+
// mainModule.set("com.xwintop.xJavaFxTool")
112+
// applicationDefaultJvmArgs = [
113+
// // ZGC
114+
// "-XX:+UseZGC",
115+
// // 当遇到空指针异常时显示更详细的信息
116+
// "-XX:+ShowCodeDetailsInExceptionMessages",
117+
// "-Dsun.java2d.opengl=true",
118+
// // 不添加此参数，打包成exe后，https协议的网络图片资源无法加载
119+
// "-Dhttps.protocols=TLSv1.1,TLSv1.2",
120+
// '--add-exports=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED',
121+
// '--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED',
122+
// '--add-exports=javafx.graphics/com.sun.javafx.util=ALL-UNNAMED',
123+
// '--add-exports=javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED',
124+
// '--add-exports=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED',
125+
// '--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED',
126+
// '--add-opens=java.base/java.lang.reflect=ALL-UNNAMED'
127+
// ]
128128
}
129129

130130
// 使用 https://badass-runtime-plugin.beryx.org/releases/latest/
@@ -151,8 +151,14 @@ runtime {
151151
noConsole = true
152152
}
153153
jpackage {
154-
imageName = application.applicationName
155-
imageOptions.addAll(['--icon', 'src/main/resources/images/icon.jpg'])
154+
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
155+
imageOptions = ['--icon', 'src/main/resources/images/icon.ico']
156+
} else if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) {
157+
imageOptions = ['--icon', 'src/main/resources/images/icon.icns']
158+
} else if (org.gradle.internal.os.OperatingSystem.current().isLinux()) {
159+
imageOptions = ['--icon', 'src/main/resources/images/icon.png']
160+
}
161+
// imageOptions.addAll(['--icon', 'src/main/resources/images/icon.png'])
156162
}
157163
}
158164

@@ -180,6 +186,6 @@ gluonfx {
180186
mainClassName = "com.xwintop.xJavaFxTool.XJavaFxToolMain"
181187
}
182188

183-
jpro {
184-
port = 8080
185-
}
189+
//jpro {
190+
// port = 8080
191+
//}

‎xJavaFxTool/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.xwintop.xJavaFxTool.controller;
22

3-
import com.jpro.webapi.HTMLView;
4-
import com.jpro.webapi.WebAPI;
53
import com.xwintop.xJavaFxTool.XJavaFxToolApplication;
64
import com.xwintop.xJavaFxTool.controller.index.PluginManageController;
75
import com.xwintop.xJavaFxTool.controller.plugin.PluginCategoryController;
@@ -16,7 +14,6 @@
1614
import com.xwintop.xJavaFxTool.utils.Config;
1715
import com.xwintop.xJavaFxTool.view.IndexView;
1816
import com.xwintop.xcore.javafx.FxApp;
19-
import com.xwintop.xcore.javafx.dialog.FxAlerts;
2017
import com.xwintop.xcore.javafx.dialog.FxDialog;
2118
import com.xwintop.xcore.util.ConfigureUtil;
2219
import com.xwintop.xcore.util.VersionChecker;
@@ -86,15 +83,15 @@ private void initView() {
8683
addNodepadAction(null);
8784
}
8885
this.indexService.addWebView(XJavaFxToolApplication.RESOURCE_BUNDLE.getString("feedback"), QQ_URL, null);
89-
if (WebAPI.isBrowser()) {
90-
String contentIframe2 = "<iframe frameborder=\"0\" style=\"width: 100%; height: 100%;\" src=\"" + STATISTICS_URL + "\"> </iframe>";
91-
HTMLView browser = new HTMLView(contentIframe2);
92-
pluginCategories.getChildren().add(browser);
93-
} else {
86+
// if (WebAPI.isBrowser()) {
87+
// String contentIframe2 = "<iframe frameborder=\"0\" style=\"width: 100%; height: 100%;\" src=\"" + STATISTICS_URL + "\"> </iframe>";
88+
// HTMLView browser = new HTMLView(contentIframe2);
89+
// pluginCategories.getChildren().add(browser);
90+
// } else {
9491
WebView browser = new WebView();
9592
WebEngine webEngine = browser.getEngine();
9693
webEngine.load(STATISTICS_URL);
97-
}
94+
// }
9895
this.tabPaneMain.getSelectionModel().select(0);
9996
}
10097

‎xJavaFxTool/src/main/java/com/xwintop/xJavaFxTool/services/IndexService.java‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.xwintop.xJavaFxTool.services;
22

3-
import com.jpro.webapi.HTMLView;
4-
import com.jpro.webapi.WebAPI;
53
import com.xwintop.xJavaFxTool.AppException;
64
import com.xwintop.xJavaFxTool.XJavaFxToolApplication;
75
import com.xwintop.xJavaFxTool.common.logback.ConsoleLogAppender;
@@ -205,28 +203,27 @@ public static Tab loadWebViewAsTab(PluginJarInfo plugin, TabPane tabPane, boolea
205203
String title = plugin.getTitle();
206204
Parent browser = null;
207205
if (url.startsWith("http")) {
208-
if (WebAPI.isBrowser()) {
209-
String contentIframe2 = "<iframe frameborder=\"0\" style=\"width: 100%; height: 100%;\" src=\"" + url + "\"> </iframe>";
210-
browser = new HTMLView(contentIframe2);
211-
} else {
206+
// if (WebAPI.isBrowser()) {
207+
// String contentIframe2 = "<iframe frameborder=\"0\" style=\"width: 100%; height: 100%;\" src=\"" + url + "\"> </iframe>";
208+
// browser = new HTMLView(contentIframe2);
209+
// } else {
212210
browser = new WebView();
213211
WebEngine webEngine = ((WebView)browser).getEngine();
214212
webEngine.load(url);
215-
}
213+
// }
216214
} else {
217215
PluginContainer pluginContainer = new PluginContainer(plugin);
218-
if (WebAPI.isBrowser()) {
219-
try {
220-
browser = new HTMLView(IOUtils.toString(pluginContainer.getResource(url).openStream(), "utf-8"));
221-
} catch (IOException e) {
222-
throw new RuntimeException(e);
223-
}
224-
} else {
216+
// if (WebAPI.isBrowser()) {
217+
// try {
218+
// browser = new HTMLView(IOUtils.toString(pluginContainer.getResource(url).openStream(), "utf-8"));
219+
// } catch (IOException e) {
220+
// throw new RuntimeException(e);
221+
// }
222+
// } else {
225223
browser = new WebView();
226224
WebEngine webEngine = ((WebView)browser).getEngine();
227225
webEngine.load(pluginContainer.getResource(url).toExternalForm());
228-
}
229-
226+
// }
230227
}
231228

232229
if (singleWindowBoot) {

‎xJavaFxTool/src/main/resources/images/icon.icns‎

53.5 KB
Binary file not shown.

‎xJavaFxTool/src/main/resources/images/icon.png‎

9.99 KB
Loading

‎xcore/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
api 'ch.qos.logback:logback-classic:1.4.13'
2+
api 'ch.qos.logback:logback-classic:1.5.6'
33
api 'org.dom4j:dom4j:2.1.4'
44
// api 'jaxen:jaxen:1.2.0'
55
api 'org.quartz-scheduler:quartz:2.3.2'

0 commit comments

Comments
 (0)