diff --git a/buildSrc/src/main/kotlin/HmppConfigure.kt b/buildSrc/src/main/kotlin/HmppConfigure.kt
index a86a689cb..b7c5be436 100644
--- a/buildSrc/src/main/kotlin/HmppConfigure.kt
+++ b/buildSrc/src/main/kotlin/HmppConfigure.kt
@@ -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)
 }
 
diff --git a/buildSrc/src/main/kotlin/MppPublishing.kt b/buildSrc/src/main/kotlin/MppPublishing.kt
index d2b3116cf..21ca3aa8c 100644
--- a/buildSrc/src/main/kotlin/MppPublishing.kt
+++ b/buildSrc/src/main/kotlin/MppPublishing.kt
@@ -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