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

Unify dependency configuration

Browse Source
This commit is contained in:
Him188 2021-12-06 12:34:00 +00:00
parent 39dd1d5f7a
commit 1783c22e30
5 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
buildSrc/src/main/kotlin/MiraiCoreDependency.kt
View File

@ -1,23 +0,0 @@
/*
* Copyright 2019-2021 Mamoe Technologies and contributors.
*
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
*
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
@file:Suppress("ObjectPropertyName", "HasPlatformType")
import org.gradle.api.Project
/*
* For compatibility with composite mirai-core and mirai-console builds and dedicated mirai-console builds.
*
* If you're in mirai project, see also root/buildSrc/MiraiCoreDependency.kt (likely path)
*/
val Project.`mirai-core-api` get() = rootProject.project(":mirai-core-api")
val Project.`mirai-core` get() = rootProject.project(":mirai-core")
val Project.`mirai-core-utils` get() = rootProject.project(":mirai-core-utils")

6
buildSrc/src/main/kotlin/Versions.kt
View File

@ -130,9 +130,9 @@ const val `kotlin-test` = "org.jetbrains.kotlin:kotlin-test:${Versions.kotlinStd
const val `kotlin-test-junit5` = "org.jetbrains.kotlin:kotlin-test-junit5:${Versions.kotlinStdlib}"
const val `mirai-core-api` = "net.mamoe:mirai-core-api:${Versions.core}"
const val `mirai-core` = "net.mamoe:mirai-core:${Versions.core}"
const val `mirai-core-utils` = "net.mamoe:mirai-core-utils:${Versions.core}"
//const val `mirai-core-api` = "net.mamoe:mirai-core-api:${Versions.core}"
//const val `mirai-core` = "net.mamoe:mirai-core:${Versions.core}"
//const val `mirai-core-utils` = "net.mamoe:mirai-core-utils:${Versions.core}"
const val `yamlkt-jvm` = "net.mamoe.yamlkt:yamlkt:${Versions.yamlkt}"

2
mirai-console/backend/codegen/build.gradle.kts
View File

@ -30,5 +30,5 @@ kotlin {
dependencies {
api(kotlin("stdlib-jdk8"))
implementation(kotlin("reflect"))
api(`mirai-core-utils`)
api(project(":mirai-core-utils"))
}

6
mirai-console/backend/mirai-console/build.gradle.kts
View File

@ -28,8 +28,8 @@ kotlin {
}
dependencies {
compileAndTestRuntime(`mirai-core-api`)
compileAndTestRuntime(`mirai-core-utils`)
compileAndTestRuntime(project(":mirai-core-api"))
compileAndTestRuntime(project(":mirai-core-utils"))
compileAndTestRuntime(`kotlin-stdlib-jdk8`)
compileAndTestRuntime(`kotlinx-atomicfu-jvm`)
@ -45,7 +45,7 @@ dependencies {
smartImplementation(`caller-finder`)
smartApi(`kotlinx-coroutines-jdk8`)
testApi(`mirai-core`)
testApi(project(":mirai-core"))
testApi(`kotlin-stdlib-jdk8`)
}

4
mirai-console/frontend/mirai-console-terminal/build.gradle.kts
View File

@ -19,10 +19,10 @@ dependencies {
implementation("org.fusesource.jansi:jansi:1.18")
compileAndTestRuntime(project(":mirai-console"))
compileAndTestRuntime(`mirai-core-api`)
compileAndTestRuntime(project(":mirai-core-api"))
compileAndTestRuntime(kotlin("stdlib-jdk8", Versions.kotlinStdlib)) // must specify `compileOnly` explicitly
testApi(`mirai-core`)
testApi(project(":mirai-core"))
testApi(project(":mirai-console"))
}