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

Fix project structure for Dokka

Browse Source 
Co-authored-by: 微莹·纤绫 <karlatemp@vip.qq.com>
This commit is contained in:
Him188 2021-12-28 15:58:22 +00:00
parent 25910dbe0c
commit 1ab48748ab
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
buildSrc/src/main/kotlin/BinaryCompatibilityConfigurator.kt
View File

@ -32,17 +32,20 @@ object BinaryCompatibilityConfigurator {
} }
project.afterEvaluate { project.afterEvaluate {
val validatorProject = findProject(project.path + ":validator-${dir.name}") val validatorProject = findProject(getValidatorDir(dir))
validatorProject validatorProject?.afterEvaluate {
?.getTasksByName("apiDump", false) tasks.getByName("apiDump").let { apiDumpAll.dependsOn(it) }
?.let { apiDumpAll.dependsOn(it) } }
validatorProject?.afterEvaluate {
tasks.getByName("apiCheck").let { apiCheckAll.dependsOn(it) }
}
validatorProject
?.getTasksByName("apiCheck", false)
?.let { apiCheckAll.dependsOn(it) }
} }
} }
private fun Project.getValidatorDir(dir: File) = ":validator" + project.path + ":${dir.name}"
/** /**
* @param targetName `null` for JVM projects. * @param targetName `null` for JVM projects.
*/ */
@ -59,9 +62,9 @@ object BinaryCompatibilityConfigurator {
) )
project.afterEvaluate { project.afterEvaluate {
findProject(project.path + ":validator-${dir.name}") findProject(getValidatorDir(dir))
?.afterEvaluate { ?.afterEvaluate {
tasks["apiBuild"].dependsOn(project.tasks["build"]) tasks.findByName("apiBuild")?.dependsOn(project.tasks["build"])
} }
} }
} }

0
mirai-console/backend/mirai-console/compatibility-validation/jvm/api/validator-jvm.api → mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api
View File

0
mirai-core-api/compatibility-validation/android/api/validator-android.api → mirai-core-api/compatibility-validation/android/api/android.api
View File

0
mirai-core-api/compatibility-validation/jvm/api/validator-jvm.api → mirai-core-api/compatibility-validation/jvm/api/jvm.api
View File

0
mirai-core/compatibility-validation/android/api/validator-android.api → mirai-core/compatibility-validation/android/api/android.api
View File

0
mirai-core/compatibility-validation/jvm/api/validator-jvm.api → mirai-core/compatibility-validation/jvm/api/jvm.api
View File

2
settings.gradle.kts
View File

@ -106,7 +106,7 @@ for (project in allProjects) {
if (!validationDir.exists()) continue if (!validationDir.exists()) continue
validationDir.listFiles().orEmpty<File>().forEach { dir -> validationDir.listFiles().orEmpty<File>().forEach { dir ->
if (dir.resolve("build.gradle.kts").isFile) { if (dir.resolve("build.gradle.kts").isFile) {
val path = project.path + ":validator-${dir.name}" val path = ":validator" + project.path + ":${dir.name}"
include(path) include(path)
project(path).projectDir = dir project(path).projectDir = dir
// project(path).name = "${project.name}-validator-${dir.name}" // project(path).name = "${project.name}-validator-${dir.name}"