github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-28 16:50:09 +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-03-30 19:05:52 +08:00
commit df14efba37
3 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,3 @@
import Versions.Publishing.bintray
import java.util.* import java.util.*
plugins { plugins {
@ -65,16 +64,14 @@ fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$v
fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version" fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
val miraiVersion = Versions.Mirai.core
dependencies { dependencies {
implementation("net.mamoe:mirai-core-jvm:$miraiVersion") compileOnly("net.mamoe:mirai-core-jvm:${Versions.Mirai.core}")
implementation("net.mamoe:mirai-core-qqandroid-jvm:$miraiVersion") compileOnly(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 = "9.0.8") api(group = "com.jfoenix", name = "jfoenix", version = "9.0.8")
testApi(project(":mirai-console"))
testApi(group = "org.yaml", name = "snakeyaml", version = "1.25") testApi(group = "org.yaml", name = "snakeyaml", version = "1.25")
} }

23
mirai-console-terminal/build.gradle.kts
View File

@ -14,29 +14,8 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>() {
attributes["Main-Class"] = "net.mamoe.mirai.console.MiraiConsoleTerminalLoader" attributes["Main-Class"] = "net.mamoe.mirai.console.MiraiConsoleTerminalLoader"
} }
} }
val kotlinVersion: String by rootProject.ext
val atomicFuVersion: String by rootProject.ext
val coroutinesVersion: String by rootProject.ext
val kotlinXIoVersion: String by rootProject.ext
val coroutinesIoVersion: String by rootProject.ext
val klockVersion: String by rootProject.ext
val ktorVersion: String by rootProject.ext
val serializationVersion: String by rootProject.ext
fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$version"
fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
val miraiVersion = Versions.Mirai.core
dependencies { dependencies {
implementation("net.mamoe:mirai-core-jvm:$miraiVersion") api("net.mamoe:mirai-core-qqandroid-jvm:${Versions.Mirai.core}")
implementation("net.mamoe:mirai-core-qqandroid-jvm:$miraiVersion")
api(project(":mirai-console")) api(project(":mirai-console"))
api(group = "com.googlecode.lanterna", name = "lanterna", version = "3.0.2") api(group = "com.googlecode.lanterna", name = "lanterna", version = "3.0.2")
} }

19
mirai-console/build.gradle.kts
View File

@ -1,5 +1,5 @@
import java.util.*
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.util.*
plugins { plugins {
kotlin("jvm") kotlin("jvm")
@ -23,18 +23,15 @@ kotlin {
} }
dependencies { dependencies {
compileOnly("net.mamoe:mirai-core-jvm:${Versions.Mirai.core}") compileOnly("net.mamoe:mirai-core-jvm:${Versions.Mirai.core}")
compileOnly("net.mamoe:mirai-core-qqandroid-jvm:${Versions.Mirai.core}") compileOnly(kotlin("stdlib")) // embedded by core
api("com.google.code.gson:gson:2.8.6")
api(group = "org.yaml", name = "snakeyaml", version = "1.25")
api(group = "com.moandjiezana.toml", name = "toml4j", version = "0.7.2")
implementation("com.google.code.gson:gson:2.8.6") testApi("net.mamoe:mirai-core-qqandroid-jvm:${Versions.Mirai.core}")
implementation(group = "org.yaml", name = "snakeyaml", version = "1.25") testApi(kotlin("stdlib"))
implementation(group = "com.moandjiezana.toml", name = "toml4j", version = "0.7.2")
implementation(kotlin("stdlib-jdk8"))
testApi(ktor("client-cio", Versions.Kotlin.ktor))
testApi(ktor("client-core", Versions.Kotlin.ktor))
testApi(ktor("network", Versions.Kotlin.ktor))
testApi("org.jsoup:jsoup:1.12.1") testApi("org.jsoup:jsoup:1.12.1")
} }