Merge remote-tracking branch 'origin/master'

This commit is contained in:
jiahua.liu 2020-02-16 14:45:49 +08:00
commit 1bc39f09ef
2 changed files with 3 additions and 1 deletions

View File

@ -28,7 +28,7 @@ dependencies {
api(project(":mirai-api-http"))
api(project(":mirai-console"))
runtimeOnly(files("../mirai-core-qqandroid/build/classes/kotlin/jvm/main"))
api(group = "no.tornado", name = "tornadofx", version = "1.7.17")
api(group = "no.tornado", name = "tornadofx", version = "1.7.19")
api("org.bouncycastle:bcprov-jdk15on:1.64")
// classpath is not set correctly by IDE
}

View File

@ -44,6 +44,8 @@ include(':mirai-core-qqandroid')
include(':mirai-japt')
include(':mirai-console')
include(':mirai-console-graphical')
include(':mirai-console-terminal')
//include(':mirai-api')
include(':mirai-api-http')
include(':mirai-demos:mirai-demo-1')