Commit 2e70218c authored by Him188's avatar Him188

Set jfx properly

parent 6601f9a0
plugins { plugins {
id("kotlinx-serialization") id("kotlinx-serialization")
id("org.openjfx.javafxplugin") version "0.0.8"
id("kotlin") id("kotlin")
id("java") id("java")
} }
javafx {
version = "11"
modules = listOf("javafx.controls")
//mainClassName = "Application"
}
apply(plugin = "com.github.johnrengelman.shadow") apply(plugin = "com.github.johnrengelman.shadow")
......
...@@ -44,7 +44,6 @@ include(':mirai-core-qqandroid') ...@@ -44,7 +44,6 @@ include(':mirai-core-qqandroid')
include(':mirai-japt') include(':mirai-japt')
include(':mirai-console') include(':mirai-console')
include(':mirai-console-graphical')
include(':mirai-console-terminal') include(':mirai-console-terminal')
//include(':mirai-api') //include(':mirai-api')
include(':mirai-api-http') include(':mirai-api-http')
...@@ -54,24 +53,23 @@ include(':mirai-demos:mirai-demo-java') ...@@ -54,24 +53,23 @@ include(':mirai-demos:mirai-demo-java')
include(':mirai-plugins') include(':mirai-plugins')
include(':mirai-plugins:image-sender') include(':mirai-plugins:image-sender')
def javaVersion = System.getProperty("java.version") try{
def versionPos = javaVersion.indexOf(".") def javaVersion = System.getProperty("java.version")
if (versionPos==-1) versionPos = javaVersion.indexOf("-") def versionPos = javaVersion.indexOf(".")
if (versionPos==-1){ if (versionPos==-1) versionPos = javaVersion.indexOf("-")
println("jdk version unknown") if (versionPos==-1){
}else{ println("jdk version unknown")
def javaVersionNum = javaVersion.substring(0, versionPos).toInteger() }else{
if (javaVersionNum >= 11) { def javaVersionNum = javaVersion.substring(0, versionPos).toInteger()
println("jdk版本为 "+ javaVersionNum) if (javaVersionNum >= 11) {
//include(':mirai-debug') println("jdk版本为 "+ javaVersionNum)
} else { include(':mirai-console-graphical')
println("当前使用的 JDK 版本为 ${System.getProperty("java.version")}, 最低需要 JDK 11 才能引入模块 `:mirai-debug`") } else {
println("当前使用的 JDK 版本为 ${System.getProperty("java.version")}, 最低需要 JDK 11 才能引入模块 `:mirai-debug`")
}
} }
} }catch(Exception ignored){
project(':mirai-demos:mirai-demo-1').projectDir = file('mirai-demos/mirai-demo-1') }
project(':mirai-demos:mirai-demo-gentleman').projectDir = file('mirai-demos/mirai-demo-gentleman')
project(':mirai-demos:mirai-demo-java').projectDir = file('mirai-demos/mirai-demo-java')
project(':mirai-plugins:image-sender').projectDir = file('mirai-plugins/image-sender')
enableFeaturePreview('GRADLE_METADATA') enableFeaturePreview('GRADLE_METADATA')
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment