github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-23 22:30:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ dependencies {
api(project(":mirai-api-http")) api(project(":mirai-api-http"))
api(project(":mirai-console")) api(project(":mirai-console"))
runtimeOnly(files("../mirai-core-qqandroid/build/classes/kotlin/jvm/main")) 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") api("org.bouncycastle:bcprov-jdk15on:1.64")
// classpath is not set correctly by IDE // classpath is not set correctly by IDE
} }

2
settings.gradle
View File

@ -44,6 +44,8 @@ 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-api') //include(':mirai-api')
include(':mirai-api-http') include(':mirai-api-http')
include(':mirai-demos:mirai-demo-1') include(':mirai-demos:mirai-demo-1')