Merge branch 'v2-compose-1.6'

raamcosta · Mar 12, 2024 · 6f9ae2a · 6f9ae2a
2 parents 6ac9066 + 2d2e7eb
commit 6f9ae2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/...en/src/main/java/com/ramcosta/composedestinations/codegen/writers/ModuleRegistryWriter.kt b/...en/src/main/java/com/ramcosta/composedestinations/codegen/writers/ModuleRegistryWriter.kt
@@ -41,8 +41,7 @@ internal class ModuleRegistryWriter(
         val registryId = moduleName.ifEmpty { UUID.randomUUID().toString().replace("-", "_") }
         val importableHelper = ImportableHelper(
             setOfImportable(
-                "com.ramcosta.composedestinations.spec.DestinationSpec",
-                "kotlin.reflect.KClass"
+                "com.ramcosta.composedestinations.spec.DestinationSpec"
             )
         )
         codeGenerator.makeFile(
@@ -60,8 +59,8 @@ internal class ModuleRegistryWriter(
                     )
                     
                     annotation class _Destination_Result_Info_$registryId(
-                        val destination: KClass<out DestinationSpec>,
-                        val resultType: KClass<*>,
+                        val destination: String,
+                        val resultType: String,
                         val isResultNullable: Boolean
                     )
                     
@@ -82,12 +81,8 @@ internal class ModuleRegistryWriter(
                     resultBackTypesByDestination.joinToString(",\n") { (destination, type) ->
                         """
                         |       _Destination_Result_Info_$registryId(
-                        |           destination = ${
-                            importableHelper.addAndGetPlaceholder(
-                                destination.destinationImportable
-                            )
-                        }::class,
-                        |           resultType = ${importableHelper.addAndGetPlaceholder(type.importable)}::class,
+                        |           destination = "${destination.destinationImportable.qualifiedName}",
+                        |           resultType = "${type.importable.qualifiedName}",
                         |           isResultNullable = ${type.isNullable}
                         |       )
                         """.trimMargin()

diff --git a/...inations-ksp/src/main/kotlin/com/ramcosta/composedestinations/ksp/processors/Processor.kt b/...inations-ksp/src/main/kotlin/com/ramcosta/composedestinations/ksp/processors/Processor.kt
@@ -151,8 +151,8 @@ class Processor(
                                 "typeResults"
                             )?.map { typeResultAnnotation ->
                                 DestinationResultSenderInfo(
-                                    typeResultAnnotation.findArgumentValue<KSType>("destination")!!.declaration.qualifiedName!!.asString(),
-                                    typeResultAnnotation.findArgumentValue<KSType>("resultType")!!.declaration.qualifiedName!!.asString(),
+                                    typeResultAnnotation.findArgumentValue<String>("destination")!!,
+                                    typeResultAnnotation.findArgumentValue<String>("resultType")!!,
                                     typeResultAnnotation.findArgumentValue<Boolean>("isResultNullable")!!,
                                 )
                             }.orEmpty()