diff --git a/mirai-console-graphical/build.gradle.kts b/mirai-console-graphical/build.gradle.kts index 35f97c320..485d44608 100644 --- a/mirai-console-graphical/build.gradle.kts +++ b/mirai-console-graphical/build.gradle.kts @@ -5,11 +5,11 @@ plugins { id("java") } -//javafx { -// version = "13.0.2" -// modules = listOf("javafx.controls") -// //mainClassName = "Application" -//} +javafx { + version = "13.0.2" + modules = listOf("javafx.controls") + //mainClassName = "Application" +} apply(plugin = "com.github.johnrengelman.shadow") @@ -45,7 +45,8 @@ dependencies { api(project(":mirai-console")) api(group = "no.tornado", name = "tornadofx", version = "1.7.19") - api(group = "com.jfoenix", name = "jfoenix", version = "8.0.8") + api(group = "com.jfoenix", name = "jfoenix", version = "9.0.8") + api(group = "com.jfoenix", name = "jfoenix", version = "9.0.8") testApi(group = "org.yaml", name = "snakeyaml", version = "1.25") } diff --git a/settings.gradle b/settings.gradle index 609c7534f..053cf61f6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -40,12 +40,11 @@ try{ javaVersionNum = javaVersion.substring(0, versionPos).toInteger() } } - if (javaVersionNum <= 8) { + if (javaVersionNum >= 9) { include(':mirai-console-graphical') } else { println("jdk版本为 "+ javaVersionNum) - println("当前使用的 JDK 版本为 ${System.getProperty("java.version")}, 模块 `:mirai-console-graphical`不支持JDK 9+\n" + - "请使用OracleJDK 1.8 或使用OpenJDK 1.8并添加Java Fx依赖") + println("当前使用的 JDK 版本为 ${System.getProperty("java.version")}, 请使用JDK 9以上版本引入模块 `:mirai-console-graphical`\n") } }catch(Exception ignored){