- Fix publishing

- Remove root module publication

.github/workflows/bintray.yml

@@ -99,6 +99,13 @@ jobs:
           -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }}
           -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }}
 
+      - name: Gradle :mirai-console-compiler-annotations:bintrayUpload
+        run: >
+          ./gradlew
+          :mirai-console-compiler-annotations:bintrayUpload --info
+          -Dbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_user=${{ secrets.BINTRAY_USER }}
+          -Dbintray_key=${{ secrets.BINTRAY_KEY }} -Pbintray_key=${{ secrets.BINTRAY_KEY }}
+
       - name: Gradle :mirai-console-intellij:bintrayUpload
         run: >
           ./gradlew

build.gradle.kts

@@ -65,6 +65,15 @@ configure<kotlinx.validation.ApiValidationExtension> {
 
 project.ext.set("isAndroidSDKAvailable", false)
 
+tasks.register("publishMiraiCoreArtifactsToMavenLocal") {
+    group = "mirai"
+    dependsOn(
+        project(":mirai-core-api").tasks.getByName("publishToMavenLocal"),
+        project(":mirai-core-utils").tasks.getByName("publishToMavenLocal"),
+        project(":mirai-core").tasks.getByName("publishToMavenLocal")
+    )
+}
+
 // until
 // https://youtrack.jetbrains.com/issue/KT-37152,
 // are fixed.

buildSrc/src/main/kotlin/MppPublishing.kt

@@ -32,7 +32,7 @@ fun Project.configureMppPublishing() {
         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
+        //  tasks.findByName("generateMetadataFileForKotlinMultiplatformPublication")?.enabled = false // FIXME: 2021/1/21
     }
 
     tasks.withType<com.jfrog.bintray.gradle.tasks.BintrayUploadTask> {

mirai-core/build.gradle.kts

@@ -57,14 +57,10 @@ kotlin {
     }*/
 
     sourceSets.apply {
-        all {
-            dependencies {
-                api(project(":mirai-core-api"))
-            }
-        }
 
         commonMain {
             dependencies {
+                api(project(":mirai-core-api"))
                 implementation(project(":mirai-core-utils"))
                 api1(`kotlinx-serialization-core`)
                 api1(`kotlinx-serialization-json`)
@@ -73,7 +69,7 @@ kotlin {
                 api1(`kotlinx-atomicfu`)
                 api1(`kotlinx-coroutines-core`)
 
-                api1(`kotlinx-io`)
+                api1(`kotlinx-io-jvm`)
                 implementation1(`kotlinx-coroutines-io`)
             }
         }
@@ -103,7 +99,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation("org.bouncycastle:bcprov-jdk15on:1.64")
-                api1(`kotlinx-io-jvm`)
                 // api(kotlinx("coroutines-debug", Versions.coroutines))
             }
         }