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

HMPP

Browse Source
This commit is contained in:
Him188 2022-05-30 14:20:20 +01:00
parent 8d65a22f01
commit 322ae8b58e
No known key found for this signature in database
GPG Key ID: BA439CDDCF652375
2 changed files with 10 additions and 10 deletions
buildSrc/src/main/kotlin
HmppConfigure.ktMppPublishing.kt

12
buildSrc/src/main/kotlin/HmppConfigure.kt
View File

@ -244,16 +244,16 @@ fun KotlinMultiplatformExtension.configureNativeTargetsHierarchical(
presets.filter { it.name in UNIX_LIKE_TARGETS }
.forEach { preset ->
addNativeTarget(preset).run {
compilations[MAIN_COMPILATION_NAME].kotlinSourceSets.first().dependsOn(unixMain)
compilations[TEST_COMPILATION_NAME].kotlinSourceSets.first().dependsOn(unixTest)
compilations[MAIN_COMPILATION_NAME].kotlinSourceSets.forEach { it.dependsOn(unixMain) }
compilations[TEST_COMPILATION_NAME].kotlinSourceSets.forEach { it.dependsOn(unixTest) }
}
}
presets.filter { it.name in WIN_TARGETS }
.forEach { preset ->
addNativeTarget(preset).run {
compilations[MAIN_COMPILATION_NAME].kotlinSourceSets.first().dependsOn(mingwMain)
compilations[TEST_COMPILATION_NAME].kotlinSourceSets.first().dependsOn(mingwTest)
compilations[MAIN_COMPILATION_NAME].kotlinSourceSets.forEach { it.dependsOn(mingwMain) }
compilations[TEST_COMPILATION_NAME].kotlinSourceSets.forEach { it.dependsOn(mingwTest) }
}
}
@ -270,9 +270,9 @@ fun KotlinMultiplatformExtension.configureNativeTargetsHierarchical(
mingwTest.dependsOn(nativeTest)
jvmMain.dependsOn(jvmBaseMain)
androidMain.dependsOn(jvmBaseMain)
jvmTest.dependsOn(jvmBaseTest)
androidMain.dependsOn(jvmBaseMain)
androidTest.dependsOn(jvmBaseTest)
}

8
buildSrc/src/main/kotlin/MppPublishing.kt
View File

@ -24,11 +24,11 @@ fun Project.configureMppPublishing() {
// mirai does some magic on MPP targets
afterEvaluate {
tasks.findByName("compileKotlinCommon")?.enabled = false
tasks.findByName("compileTestKotlinCommon")?.enabled = false
// tasks.findByName("compileKotlinCommon")?.enabled = false
// tasks.findByName("compileTestKotlinCommon")?.enabled = false
tasks.findByName("compileCommonMainKotlinMetadata")?.enabled = false
tasks.findByName("compileKotlinMetadata")?.enabled = false
// tasks.findByName("compileCommonMainKotlinMetadata")?.enabled = false
// tasks.findByName("compileKotlinMetadata")?.enabled = false
// TODO: 2021/1/30 如果添加 JVM 到 root module, 这个 task 会失败因 root module artifacts 有变化
// tasks.findByName("generateMetadataFileForKotlinMultiplatformPublication")?.enabled = false // FIXME: 2021/1/21