github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-04 01:33:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Graphical from 8 to 9+

Browse Source
This commit is contained in:
ryoii 2020-03-28 17:04:14 +08:00
parent 099e76b188
commit daf75c4441
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mirai-console-graphical/build.gradle.kts
View File

@ -5,11 +5,11 @@ plugins {
id("java") id("java")
} }
//javafx { javafx {
// version = "13.0.2" version = "13.0.2"
// modules = listOf("javafx.controls") modules = listOf("javafx.controls")
// //mainClassName = "Application" //mainClassName = "Application"
//} }
apply(plugin = "com.github.johnrengelman.shadow") apply(plugin = "com.github.johnrengelman.shadow")
@ -45,7 +45,8 @@ dependencies {
api(project(":mirai-console")) api(project(":mirai-console"))
api(group = "no.tornado", name = "tornadofx", version = "1.7.19") 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") testApi(group = "org.yaml", name = "snakeyaml", version = "1.25")
} }

5
settings.gradle
View File

@ -40,12 +40,11 @@ try{
javaVersionNum = javaVersion.substring(0, versionPos).toInteger() javaVersionNum = javaVersion.substring(0, versionPos).toInteger()
} }
} }
if (javaVersionNum <= 8) { if (javaVersionNum >= 9) {
include(':mirai-console-graphical') include(':mirai-console-graphical')
} else { } else {
println("jdk版本为 "+ javaVersionNum) println("jdk版本为 "+ javaVersionNum)
println("当前使用的 JDK 版本为 ${System.getProperty("java.version")}, 模块 `:mirai-console-graphical`不支持JDK 9+\n" + println("当前使用的 JDK 版本为 ${System.getProperty("java.version")}, 请使用JDK 9以上版本引入模块 `:mirai-console-graphical`\n")
"请使用OracleJDK 1.8 或使用OpenJDK 1.8并添加Java Fx依赖")
} }
}catch(Exception ignored){ }catch(Exception ignored){