Replace JVM variant in root publication with "available-at"

Leave the JVM jar artifact in the root publication for Maven consumers.
The separate variant is ruining interproject publication because Gradle
doesn't understand which publication coordinates to use.

^KT-77531

Author: timofey-solonin

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/uklibs/KmpGradlePublicationMetadataIT.kt

@@ -587,61 +587,7 @@ private val uklibJvmStubVariants = mutableSetOf(
     ),
 )
 
-private val uklibJvmVariants = mutableSetOf(
-    Variant(
-        attributes = mutableMapOf(
-            "org.gradle.category" to "library",
-            "org.gradle.jvm.environment" to "standard-jvm",
-            "org.gradle.libraryelements" to "jar",
-            "org.gradle.usage" to "java-api",
-            "org.jetbrains.kotlin.platform.type" to "jvm",
-        ),
-        availableAt = null,
-        files = mutableListOf(
-            VariantFile(
-                name = "empty-jvm-1.0.jar",
-                url = "empty-1.0.jar",
-            ),
-        ),
-        name = "jvmApiElements",
-    ),
-    Variant(
-        attributes = mutableMapOf(
-            "org.gradle.category" to "library",
-            "org.gradle.jvm.environment" to "standard-jvm",
-            "org.gradle.libraryelements" to "jar",
-            "org.gradle.usage" to "java-runtime",
-            "org.jetbrains.kotlin.platform.type" to "jvm",
-        ),
-        availableAt = null,
-        files = mutableListOf(
-            VariantFile(
-                name = "empty-jvm-1.0.jar",
-                url = "empty-1.0.jar",
-            ),
-        ),
-        name = "jvmRuntimeElements",
-    ),
-    Variant(
-        attributes = mutableMapOf(
-            "org.gradle.category" to "documentation",
-            "org.gradle.dependency.bundling" to "external",
-            "org.gradle.docstype" to "sources",
-            "org.gradle.jvm.environment" to "standard-jvm",
-            "org.gradle.libraryelements" to "jar",
-            "org.gradle.usage" to "java-runtime",
-            "org.jetbrains.kotlin.platform.type" to "jvm",
-        ),
-        availableAt = null,
-        files = mutableListOf(
-            VariantFile(
-                name = "empty-jvm-1.0-sources.jar",
-                url = "empty-1.0-sources.jar",
-            ),
-        ),
-        name = "jvmSourcesElements",
-    ),
-)
+private val uklibJvmVariants = jvmSubcomponentVariants
 
 private val uklibCompatibilityMetadataVariants = mutableSetOf(
     Variant(

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/uklibs/UklibPublicationIT.kt

@@ -371,21 +371,27 @@ class UklibPublicationIT : KGPBaseTest() {
             addKgpToBuildScriptCompilationClasspath()
             val dependency = project("empty", gradleVersion) {
                 buildScriptInjection {
+                    project.setUklibPublicationStrategy()
+                    project.setUklibResolutionStrategy()
+                    project.plugins.apply("maven-publish")
                     project.group = "dependencyGroup"
                     project.version = "2.0"
                     project.applyMultiplatform {
                         linuxArm64()
                         linuxX64()
-                        sourceSets.linuxMain.get().compileStubSourceWithSourceSetName()
+                        jvm()
+                        sourceSets.commonMain.get().compileStubSourceWithSourceSetName()
                     }
                 }
             }
             val publisher = project("empty", gradleVersion) {
                 buildScriptInjection {
                     project.setUklibPublicationStrategy()
+                    project.setUklibResolutionStrategy()
                     project.applyMultiplatform {
                         linuxArm64()
                         linuxX64()
+                        jvm()
                         sourceSets.commonMain.get().compileStubSourceWithSourceSetName()
                         sourceSets.commonMain.dependencies {
                             implementation(project(":dependency"))

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/artifacts/KotlinJvmJarArtifact.kt

@@ -9,6 +9,7 @@ import org.gradle.api.artifacts.Dependency.ARCHIVES_CONFIGURATION
 import org.gradle.api.artifacts.type.ArtifactTypeDefinition.JAR_TYPE
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
 import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.Companion.kotlinPropertiesProvider
+import org.jetbrains.kotlin.gradle.plugin.mpp.publishing.kotlinMultiplatformRootPublication
 import org.jetbrains.kotlin.gradle.plugin.mpp.uklibs.consumption.uklibStateAttribute
 import org.jetbrains.kotlin.gradle.plugin.mpp.uklibs.consumption.uklibStateDecompressed
 import org.jetbrains.kotlin.gradle.plugin.mpp.uklibs.consumption.uklibViewAttribute
@@ -17,6 +18,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.uklibs.publication.maybeCreateUkli
 import org.jetbrains.kotlin.gradle.plugin.mpp.uklibs.publication.maybeCreateUklibRuntimeElements
 import org.jetbrains.kotlin.gradle.plugin.mpp.uklibs.uklibFragmentPlatformAttribute
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
+import org.jetbrains.kotlin.gradle.plugin.launch
 import org.jetbrains.kotlin.gradle.utils.registerArtifact
 import org.jetbrains.kotlin.gradle.utils.registerKlibArtifact
 
@@ -47,6 +49,11 @@ internal val KotlinJvmJarArtifact = KotlinTargetArtifact { target, apiElements,
                     }
                 }
             }
+
+            target.project.launch {
+                val rootPublication = target.project.kotlinMultiplatformRootPublication.await()
+                rootPublication?.artifact(artifact)
+            }
         }
         KmpPublicationStrategy.StandardKMPPublication -> {}
     }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinSoftwareComponent.kt

@@ -55,13 +55,7 @@ abstract class KotlinSoftwareComponent(
         return kotlinTargets
             .filter { target ->
                 if (target is KotlinMetadataTarget) return@filter false
-                when (project.kotlinPropertiesProvider.kmpPublicationStrategy) {
-                    KmpPublicationStrategy.UklibPublicationInASingleComponentWithKMPPublication ->
-                        // Exclude subcomponent pointer from the root component
-                        target !is KotlinJvmTarget
-                    KmpPublicationStrategy.StandardKMPPublication ->
-                        true
-                }
+                true
             }
     }
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/uklibs/publication/locateOrRegisterArchiveUklibTask.kt

@@ -161,12 +161,7 @@ private suspend fun Project.createOutgoingUklibConfigurationsAndUsages(
      * usages here or create them using a shared execution path without the copypasted code below when jvm target is not present
      */
     val jvmTarget = project.multiplatformExtension.awaitTargets().singleOrNull { it is KotlinJvmTarget }
-    if (jvmTarget != null) {
-        val kotlinTargetComponent = jvmTarget.components.single() as KotlinTargetSoftwareComponentImpl
-        // FIXME: KT-76687
-        @Suppress("UNCHECKED_CAST")
-        variants += kotlinTargetComponent.kotlinComponent.internal.usages as Set<DefaultKotlinUsageContext>
-    } else {
+    if (jvmTarget == null) {
         // FIXME: Test that stubJvmVariant inherits dependencies from relevant configurations
         val jar = stubJvmJarTask()
         configurations.createConsumable(UKLIB_JAVA_API_ELEMENTS_STUB_NAME) {