Fix Kotlin Multiplatform support

CHANGELOG.md

@@ -12,6 +12,8 @@
 
 ### Fixed
 
+- Kotlin multiplatform support
+
 ### Removed
 
 ### Updated

gradle/libs.versions.toml

@@ -1,11 +1,12 @@
 [versions]
-hubdle = "0.7.8"
-hubdleCatalog = "0.3.7"
-javiersc-kotlin-compiler-extensions = "0.3.0+2.0.20"
+hubdle = "0.7.10"
+hubdleCatalog = "0.3.8"
+javiersc-kotlin-compiler-extensions = "0.4.1+2.0.20"
 
 [libraries]
 hubdle-catalog = { module = "com.javiersc.hubdle:hubdle-version-catalog", version.ref = "hubdleCatalog" }
 javiersc-kotlin-compiler-extensions = { module = "com.javiersc.kotlin:kotlin-compiler-extensions", version.ref = "javiersc-kotlin-compiler-extensions" }
+javiersc-kotlin-compiler-gradle-extensions = { module = "com.javiersc.kotlin:kotlin-compiler-gradle-extensions", version.ref = "javiersc-kotlin-compiler-extensions" }
 javiersc-kotlin-compiler-test-extensions = { module = "com.javiersc.kotlin:kotlin-compiler-test-extensions", version.ref = "javiersc-kotlin-compiler-extensions" }
 
 [plugins]

kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyAssignExpressionAltererExtension.kt

@@ -5,7 +5,7 @@ package com.javiersc.kotlin.kopy.compiler.fir.generation
 import com.javiersc.kotlin.compiler.extensions.fir.asFirOrNull
 import com.javiersc.kotlin.kopy.compiler.kopyClassId
 import com.javiersc.kotlin.kopy.compiler.kopyFqName
-import com.javiersc.kotlin.kopy.compiler.utils.toName
+import com.javiersc.kotlin.kopy.compiler.setName
 import org.jetbrains.kotlin.KtFakeSourceElementKind.AssignmentPluginAltered
 import org.jetbrains.kotlin.fakeElement
 import org.jetbrains.kotlin.fir.FirSession
@@ -77,7 +77,7 @@ internal class FirKopyAssignExpressionAltererExtension(
             argumentList = buildUnaryArgumentList(rightArgument)
             calleeReference = buildSimpleNamedReference {
                 source = variableAssignment.source
-                name = "set".toName()
+                name = setName
             }
             origin = FirFunctionCallOrigin.Regular
         }

kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/fir/generation/FirKopyDeclarationGenerationExtension.kt

@@ -2,6 +2,7 @@
 
 package com.javiersc.kotlin.kopy.compiler.fir.generation
 
+import com.javiersc.kotlin.compiler.extensions.common.toName
 import com.javiersc.kotlin.compiler.extensions.fir.createFirAnnotation
 import com.javiersc.kotlin.compiler.extensions.fir.toFirTypeRef
 import com.javiersc.kotlin.kopy.args.KopyFunctions
@@ -24,7 +25,6 @@ import com.javiersc.kotlin.kopy.compiler.setName
 import com.javiersc.kotlin.kopy.compiler.underscoreAtomicName
 import com.javiersc.kotlin.kopy.compiler.updateEachName
 import com.javiersc.kotlin.kopy.compiler.updateName
-import com.javiersc.kotlin.kopy.compiler.utils.toName
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibilities

kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/ir/utils/isKopy.kt

@@ -1,5 +1,6 @@
 package com.javiersc.kotlin.kopy.compiler.ir.utils
 
+import com.javiersc.kotlin.compiler.extensions.ir.hasAnnotation
 import com.javiersc.kotlin.kopy.compiler.kopyFunctionCopyFqName
 import com.javiersc.kotlin.kopy.compiler.kopyFunctionInvokeFqName
 import com.javiersc.kotlin.kopy.compiler.kopyFunctionSetFqName

kopy-compiler/main/kotlin/com/javiersc/kotlin/kopy/compiler/values.kt

@@ -1,9 +1,9 @@
 package com.javiersc.kotlin.kopy.compiler
 
-import com.javiersc.kotlin.kopy.compiler.utils.toCallableId
-import com.javiersc.kotlin.kopy.compiler.utils.toClassId
-import com.javiersc.kotlin.kopy.compiler.utils.toFqName
-import com.javiersc.kotlin.kopy.compiler.utils.toName
+import com.javiersc.kotlin.compiler.extensions.common.toCallableId
+import com.javiersc.kotlin.compiler.extensions.common.toClassId
+import com.javiersc.kotlin.compiler.extensions.common.toFqName
+import com.javiersc.kotlin.compiler.extensions.common.toName
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName

kopy-gradle-plugin/build.gradle.kts

@@ -11,6 +11,13 @@ hubdle {
         format.isEnabled = false
         projectConfig { //
             generateProjectData(true)
+            generateAdditionalData {
+                const(
+                    name = "compilerExtensions",
+                    type = "String",
+                    value = "${hubdle.javiersc.kotlin.compiler.extensions.get()}",
+                )
+            }
         }
         publishing()
     }
@@ -59,6 +66,7 @@ hubdle {
                 dependencies {
                     implementation(gradleKotlinDsl())
                     api(projects.kopyArgs)
+                    implementation(libs.javiersc.kotlin.compiler.gradle.extensions)
                     compileOnly(projects.kopyCompiler)
                     compileOnly(hubdle.jetbrains.kotlin.gradle.plugin)
                 }

kopy-gradle-plugin/main/kotlin/com/javiersc/kotlin/kopy/gradle/plugin/KopyGradlePlugin.kt

@@ -1,6 +1,7 @@
 package com.javiersc.kotlin.kopy.gradle.plugin
 
 import com.javiersc.gradle.logging.extensions.warnColored
+import com.javiersc.kotlin.compiler.gradle.extensions.KotlinCompilerGradlePlugin
 import com.javiersc.kotlin.kopy.args.KopyFunctions
 import com.javiersc.kotlin.kopy.args.KopyVisibility
 import com.javiersc.kotlin.kopy.compiler.KopyCompilerProjectData
@@ -15,7 +16,6 @@ import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.the
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin
 import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
 import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
@@ -24,21 +24,28 @@ public class KopyGradlePlugin
 @Inject
 constructor(
     private val providers: ProviderFactory,
-) : KotlinCompilerPluginSupportPlugin {
+) : KotlinCompilerGradlePlugin {
 
     private val Project.kopy: KopyExtension
         get() = the<KopyExtension>()
 
-
     override fun apply(target: Project) {
+        super.apply(target)
         target.createExtension()
         target.withKotlin {
             suppressKopyOptInt()
             reportKotlinVersion()
         }
         target.withKotlinAndroid { dependencies { "api"(kopyRuntime) } }
         target.withKotlinJvm { dependencies { "api"(kopyRuntime) } }
-        target.withKotlinMultiplatform { dependencies { "commonMainApi"(kopyRuntime) } }
+        target.withKotlinMultiplatform {
+            dependencies {
+                "commonMainApi"(kopyRuntime)
+                compilerClasspath(kopyArgs)
+                compilerClasspath(kopyRuntime)
+                compilerClasspath(KopyGradlePluginAdditionalData.compilerExtensions)
+            }
+        }
     }
 
     override fun applyToCompilation(
@@ -113,5 +120,8 @@ constructor(
     }
 }
 
+private const val kopyArgs =
+    "com.javiersc.kotlin:kopy-args:${KopyCompilerProjectData.Version}"
+
 private const val kopyRuntime =
     "com.javiersc.kotlin:kopy-runtime:${KopyCompilerProjectData.Version}"