Kotlin 2.X, Fix KotlinWithJava publishing

Author: natario1

.idea/kotlinc.xml

@@ -4,12 +4,12 @@ plugins {
     `kotlin-dsl`
     `java-gradle-plugin`
     id("io.deepmedia.tools.deployer") version "0.17.0-rc1"
-    kotlin("plugin.serialization") version "1.9.23"
+    kotlin("plugin.serialization") version "2.1.20"
     id("org.jetbrains.dokka") version "1.9.20"
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20")
 
     // api("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
 

deployer/build.gradle.kts

@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaTarget
 
 internal class KotlinInference : Inference {
     private val pluginIds = listOf(
@@ -22,15 +23,19 @@ internal class KotlinInference : Inference {
             // Should use AndroidInference!
             return
         }
-        if (target is KotlinOnlyTarget<*>) {
+        if (target is KotlinOnlyTarget<*> || target is KotlinWithJavaTarget<*, *>) {
             create(true) {
-                fromKotlinTarget(target)
+                if (target is KotlinOnlyTarget<*>) {
+                    fromKotlinTarget(target)
+                } else if (target is KotlinWithJavaTarget<*, *>) {
+                    fromKotlinTarget(target)
+                }
                 if (multiplatform && target.platformType != KotlinPlatformType.common) {
                     artifactId.set { "$it-${target.name.lowercase()}" }
                 }
             }
         } else {
-            error("Unexpected kotlin target: $target")
+            error("Unexpected kotlin target: $target (${target::class})")
         }
     }
 

deployer/src/main/kotlin/io/deepmedia/tools/deployer/inference/KotlinInference.kt

@@ -11,8 +11,6 @@ import org.gradle.api.provider.Property
 import org.gradle.api.publish.PublicationContainer
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
-import org.gradle.api.tasks.TaskProvider
-import org.gradle.api.tasks.bundling.Jar
 import org.gradle.kotlin.dsl.*
 import org.gradle.plugin.devel.PluginDeclaration
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
@@ -122,19 +120,16 @@ open class Component @Inject constructor(private val objects: ObjectFactory) {
             // already has the component so no extra configureWhen is needed here. See:
             // https://youtrack.jetbrains.com/issue/KT-53300
         } else {
-            fromNonAndroidNonMetadataKotlinTarget(target)
+            val softwareComponents = (target as KotlinTarget).components
+            val softwareComponent = softwareComponents.singleOrNull()
+            softwareComponent ?: error("$target has more/less than 1 component: $softwareComponents")
+            fromSoftwareComponent(softwareComponent, target)
         }
     }
 
     fun fromKotlinTarget(target: KotlinWithJavaTarget<*, *>) {
-        fromNonAndroidNonMetadataKotlinTarget(target)
-    }
-
-    private fun fromNonAndroidNonMetadataKotlinTarget(target: KotlinTarget) {
-        val softwareComponents = target.components
-        val softwareComponent = softwareComponents.singleOrNull()
-        softwareComponent ?: error("$target has more/less than 1 component: ${softwareComponents}")
-        fromSoftwareComponent(softwareComponent, target)
+        // target.components doesn't work in this case.
+        fromSoftwareComponent("java", target)
     }
 
     /**