Adjust dependencies

This commit is contained in:
Him188 2020-03-30 17:37:07 +08:00
parent a5d25c03d1
commit b7dc52b2d3
3 changed files with 10 additions and 33 deletions

View File

@ -65,6 +65,7 @@ fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$v
fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
dependencies {
compileOnly("net.mamoe:mirai-core-jvm:${Versions.Mirai.core}")
compileOnly(project(":mirai-console"))
api(group = "no.tornado", name = "tornadofx", version = "1.7.19")

View File

@ -14,29 +14,8 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>() {
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 {
implementation("net.mamoe:mirai-core-jvm:$miraiVersion")
implementation("net.mamoe:mirai-core-qqandroid-jvm:$miraiVersion")
api("net.mamoe:mirai-core-qqandroid-jvm:${Versions.Mirai.core}")
api(project(":mirai-console"))
api(group = "com.googlecode.lanterna", name = "lanterna", version = "3.0.2")
}

View File

@ -1,5 +1,5 @@
import java.util.*
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.util.*
plugins {
kotlin("jvm")
@ -23,18 +23,15 @@ kotlin {
}
dependencies {
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")
implementation(group = "org.yaml", name = "snakeyaml", version = "1.25")
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("net.mamoe:mirai-core-qqandroid-jvm:${Versions.Mirai.core}")
testApi(kotlin("stdlib"))
testApi("org.jsoup:jsoup:1.12.1")
}