Merge remote-tracking branch 'origin/master'

mirai-console-graphical/build.gradle.kts

@@ -13,6 +13,13 @@ javafx {
 
 apply(plugin = "com.github.johnrengelman.shadow")
 
+tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>() {
+    manifest {
+        attributes["Main-Class"] = "net.mamoe.mirai.console.graphical.MiraiGraphicalLoader"
+    }
+}
+
+
 val kotlinVersion: String by rootProject.ext
 val atomicFuVersion: String by rootProject.ext
 val coroutinesVersion: String by rootProject.ext
@@ -41,4 +48,4 @@ dependencies {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions.jvmTarget = "1.8"
-}
+}

mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/MiraiGraphical.kt

@@ -17,8 +17,11 @@ import tornadofx.App
 import tornadofx.find
 import tornadofx.launch
 
-fun main(args: Array<String>) {
-    launch<MiraiGraphicalUI>(args)
+object MiraiGraphicalLoader {
+    @JvmStatic
+    fun main(args: Array<String>) {
+        launch<MiraiGraphicalUI>(args)
+    }
 }
 
 class MiraiGraphicalUI : App(Decorator::class, PrimaryStyleSheet::class) {