fixed wasm publication (#208)

Author: Mr3zee

gradle-conventions-settings/src/main/kotlin/util/JsTarget.kt

@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
 import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
 import java.io.File
 
-fun ProjectKotlinConfig.configureJsAndWasmJs() {
+fun ProjectKotlinConfig.configureJs() {
     if (!js) {
         return
     }

gradle-conventions-settings/src/main/kotlin/util/PublicationUtils.kt

@@ -9,17 +9,26 @@ package util
 import org.gradle.api.Project
 import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.api.provider.Property
+import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.kotlin.dsl.maven
+import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import java.io.File
 
 const val KOTLINX_RPC_PREFIX = "kotlinx-rpc"
 
+/**
+ * Important to configure inside [KotlinTarget.mavenPublication]
+ * AND in [PublishingExtension.configurePublication] in the conventions-publishing.gradle.kts file.
+ */
+@Suppress("KDocUnresolvedReference")
 fun MavenPublication.setPublicArtifactId(project: Project) {
     val publication = this
 
-    publication.artifactId = "$KOTLINX_RPC_PREFIX-$artifactId"
-    project.logger.info("Altered artifactId for $name publication: $artifactId")
+    if (!publication.artifactId.startsWith(KOTLINX_RPC_PREFIX)) {
+        publication.artifactId = "$KOTLINX_RPC_PREFIX-$artifactId"
+        project.logger.info("Altered artifactId for $name publication: $artifactId")
+    }
 }
 
 /**

gradle-conventions-settings/src/main/kotlin/util/TargetUtils.kt

@@ -69,8 +69,6 @@ private fun Project.configureDetekt(targets: List<KotlinTarget>) {
 }
 
 fun ProjectKotlinConfig.configureKotlin(action: Action<KotlinMultiplatformExtension> = Action { }) {
-    configureJsAndWasmJs()
-
     kotlin {
         val includedTargets = configureTargets(this@configureKotlin)
 

gradle-conventions/src/main/kotlin/compiler-specific-module.gradle.kts

@@ -33,7 +33,7 @@ fun NamedDomainObjectContainer<KotlinSourceSet>.applyCompilerSpecificSourceSets(
         // choose 'latest' if there are no more specific ones
         val mostSpecificApplicable = vsSets.mostSpecificVersionOrLatest(kotlinVersion)
 
-        logger.info(
+        logger.lifecycle(
             "${project.name}: included version specific source sets: " +
                     "${core.name}${mostSpecificApplicable?.let { ", $name" } ?: ""}"
         )
@@ -49,7 +49,9 @@ fun NamedDomainObjectContainer<KotlinSourceSet>.applyCompilerSpecificSourceSets(
         set.configureResources(sourceSetPath)
 
         val excluded = vsSets.filter { it != mostSpecificApplicable }
-        logger.info("${project.name}: excluded version specific source sets: [${excluded.joinToString { it.name }}]")
+        logger.lifecycle(
+            "${project.name}: excluded version specific source sets: [${excluded.joinToString { it.name }}]"
+        )
     }
 }
 

gradle-conventions/src/main/kotlin/conventions-kmp.gradle.kts

@@ -18,6 +18,7 @@ configure<KotlinMultiplatformExtension> {
 
 withKotlinConfig {
     configureKotlin()
+    configureJs()
     configureWasm()
 }
 

gradle-conventions/src/main/kotlin/conventions-publishing.gradle.kts

@@ -47,6 +47,7 @@ fun PublishingExtension.configurePublication() {
             publication.artifact(javadocJar)
         }
 
+        // mainly for kotlinMultiplatform publication
         publication.setPublicArtifactId(project)
 
         if (!isGradlePlugin) {

gradle-conventions/src/main/latest/util/wasm.kt

@@ -5,10 +5,17 @@
 package util
 
 import org.gradle.kotlin.dsl.invoke
+import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 @OptIn(ExperimentalWasmDsl::class)
 fun ProjectKotlinConfig.configureWasm() {
+    fun KotlinTarget.configurePublication() {
+        mavenPublication {
+            setPublicArtifactId(project)
+        }
+    }
+
     kotlin {
         if (wasmJs) {
             wasmJs {
@@ -19,7 +26,7 @@ fun ProjectKotlinConfig.configureWasm() {
                 d8()
 
                 binaries.library()
-            }
+            }.configurePublication()
 
             sourceSets {
                 wasmJsMain {
@@ -39,7 +46,7 @@ fun ProjectKotlinConfig.configureWasm() {
                 nodejs()
 
                 binaries.library()
-            }
+            }.configurePublication()
         }
     }
 }

tests/compiler-plugin-tests/build.gradle.kts

@@ -161,6 +161,6 @@ fun Test.setJarPathAsProperty(
 }
 
 fun Test.systemPropertyLogged(name: String, value: Any) {
-    logger.info("Setting prop $name=$value")
+    logger.lifecycle("Setting test prop $name=$value")
     systemProperty(name, value)
 }