Undo artefact renaming. It is broken. Instead accept that android/jvm…

… serialization requires additional artefacts.

core/base/build.gradle.kts

@@ -50,26 +50,20 @@ kotlin {
     applyDefaultXmlUtilHierarchyTemplate()
     explicitApi()
 
-    components.configureEach {
-        val c: SoftwareComponent = this
-
-        logger.lifecycle("Found component ${c.name}")
-    }
-
     val testTask = tasks.create("test") {
         group = "verification"
     }
     val cleanTestTask = tasks.create("cleanTest") {
         group = "verification"
     }
 
-    jvm {
+    jvm("jvmCommon") {
         compilations.all {
             tasks.named<Test>("${target.name}Test") {
                 testTask.dependsOn(this)
             }
             cleanTestTask.dependsOn(tasks.getByName("clean${target.name[0].uppercaseChar()}${target.name.substring(1)}Test"))
-            tasks.named<Jar>("jvmJar") {
+            tasks.named<Jar>("jvmCommonJar") {
                 manifest {
                     attributes("Automatic-Module-Name" to autoModuleName)
                 }
@@ -116,12 +110,6 @@ kotlin {
     }
 
     targets.all {
-        val targetName = name
-        mavenPublication {
-            when (targetName) {
-                "jvm" -> artifactId = "core-jvmCommon"
-            }
-        }
         @Suppress("OPT_IN_USAGE")
         when (val t = this) {
             is HasConfigurableKotlinCompilerOptions<*> -> t.compilerOptions {
@@ -146,7 +134,7 @@ kotlin {
             }
         }
 
-        val jvmTest by getting {
+        val jvmCommonTest by getting {
             dependencies {
                 implementation(kotlin("test-junit5"))
                 implementation(libs.junit5.api)
@@ -165,12 +153,6 @@ kotlin {
 
 }
 
-publishing {
-    publications.withType<MavenPublication>().named("kotlinMultiplatform") {
-        artifactId = "core-base"
-    }
-}
-
 addNativeTargets()
 
 apiValidation {

core/compat/build.gradle.kts

@@ -39,16 +39,8 @@ kotlin {
     explicitApi()
     applyDefaultXmlUtilHierarchyTemplate()
 
-    jvm("jdk") {
-        mavenPublication {
-            artifactId = "core-compat-jdk"
-        }
-    }
-    jvm("android") {
-        mavenPublication {
-            artifactId = "core-compat-android"
-        }
-    }
+    jvm("jdk")
+    jvm("android")
     js {
         browser()
     }
@@ -85,14 +77,4 @@ kotlin {
 
 addNativeTargets()
 
-publishing {
-    publications.withType<MavenPublication>().named("kotlinMultiplatform") {
-        artifactId = "core"
-        components.named("kotlin") {
-            val c: ComponentWithVariants = this as ComponentWithVariants
-            logger.lifecycle("Found component \"kotlin\" with variants")
-        }
-    }
-}
-
 doPublish("compat")

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ kotlin = "2.0.0"
 kotlinx-serialization = "1.7.0-RC"
 kxml2 = "2.3.0"
 woodstox = "6.6.2"
-xmlutil = "0.90.0-RC3-SNAPSHOT"
+xmlutil = "0.90.0-RC4-SNAPSHOT"
 
 [libraries]
 woodstox = { module = "com.fasterxml.woodstox:woodstox-core", version.ref = "woodstox" }