From 2d2e7eba5c005324515d513349e4740cbea07dcc Mon Sep 17 00:00:00 2001 From: Rafael Costa Date: Tue, 12 Mar 2024 15:13:15 +0000 Subject: [PATCH] Fixes #600 --- .../codegen/writers/ModuleRegistryWriter.kt | 15 +++++---------- .../ksp/processors/Processor.kt | 4 ++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/compose-destinations-codegen/src/main/java/com/ramcosta/composedestinations/codegen/writers/ModuleRegistryWriter.kt b/compose-destinations-codegen/src/main/java/com/ramcosta/composedestinations/codegen/writers/ModuleRegistryWriter.kt index 4609373e..e54fbe12 100644 --- a/compose-destinations-codegen/src/main/java/com/ramcosta/composedestinations/codegen/writers/ModuleRegistryWriter.kt +++ b/compose-destinations-codegen/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, - 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/compose-destinations-ksp/src/main/kotlin/com/ramcosta/composedestinations/ksp/processors/Processor.kt b/compose-destinations-ksp/src/main/kotlin/com/ramcosta/composedestinations/ksp/processors/Processor.kt index aaf2afc1..51d451aa 100644 --- a/compose-destinations-ksp/src/main/kotlin/com/ramcosta/composedestinations/ksp/processors/Processor.kt +++ b/compose-destinations-ksp/src/main/kotlin/com/ramcosta/composedestinations/ksp/processors/Processor.kt @@ -151,8 +151,8 @@ class Processor( "typeResults" )?.map { typeResultAnnotation -> DestinationResultSenderInfo( - typeResultAnnotation.findArgumentValue("destination")!!.declaration.qualifiedName!!.asString(), - typeResultAnnotation.findArgumentValue("resultType")!!.declaration.qualifiedName!!.asString(), + typeResultAnnotation.findArgumentValue("destination")!!, + typeResultAnnotation.findArgumentValue("resultType")!!, typeResultAnnotation.findArgumentValue("isResultNullable")!!, ) }.orEmpty()