github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-04-25 21:23:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

buildPlugin: Change output directory back to build/mirai

Browse Source
This commit is contained in:
Him188 2022-04-24 15:24:39 +01:00
parent 0e72fe9757
commit a4562a7aef
2 changed files with 5 additions and 2 deletions
mirai-console/tools/gradle-plugin/src
integTest/kotlin
TestBuildPlugin.kt
main/kotlin
MiraiConsoleGradlePlugin.kt

4
mirai-console/tools/gradle-plugin/src/integTest/kotlin/TestBuildPlugin.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright 2019-2021 Mamoe Technologies and contributors.
* Copyright 2019-2022 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.
@ -204,7 +204,7 @@ class TestBuildPlugin : AbstractTest() {
}
}
private fun findJar(): File = tempDir.resolve("build/libs").listFiles()!!.first { it.name.endsWith(".mirai.jar") }
private fun findJar(): File = tempDir.resolve("build/mirai").listFiles()!!.first { it.name.endsWith(".mirai.jar") }
private fun checkOutput() {
val jar = findJar()

3
mirai-console/tools/gradle-plugin/src/main/kotlin/MiraiConsoleGradlePlugin.kt
View File

@ -121,6 +121,9 @@ public class MiraiConsoleGradlePlugin : Plugin<Project> {
"miraiPrepareMetadata".wrapNameWithPlatform(target, isSingleTarget)
)
buildPluginV2.init(target)
buildPluginV2.destinationDirectory.value(
project.layout.projectDirectory.dir(project.buildDir.name).dir("mirai")
)
}
tasks.create(
"buildPluginLegacy".wrapNameWithPlatform(target, isSingleTarget),