Bugfixes

- Fix default arguments missing in annotation argument parser - Fix exception in ksp processor - Fix failing test - Enable automatic release
kordlib · Jun 30, 2024 · daabd5d · daabd5d
1 parent 893e296
commit daabd5d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/buildSrc/src/main/kotlin/kord-publishing.gradle.kts b/buildSrc/src/main/kotlin/kord-publishing.gradle.kts
@@ -3,9 +3,6 @@ import com.vanniktech.maven.publish.KotlinJvm
 import com.vanniktech.maven.publish.KotlinMultiplatform
 import org.intellij.lang.annotations.Language
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
-import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget
-import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 plugins {
     org.jetbrains.dokka
@@ -50,7 +47,7 @@ tasks {
 }
 
 mavenPublishing {
-    publishToMavenCentral()
+    publishToMavenCentral(automaticRelease = true)
     if (!System.getenv("ORG_GRADLE_PROJECT_signingInMemoryKey").isNullOrBlank()) {
         signAllPublications()
     }

diff --git a/ksp/processor/src/main/kotlin/generator/DataClassRepresentation.kt b/ksp/processor/src/main/kotlin/generator/DataClassRepresentation.kt
@@ -38,12 +38,10 @@ private fun KSTypeReference.dataClassType(rootType: KSClassDeclaration): TypeNam
 
         else -> {
             val declaration = resolvedType.declaration
-            if (resolvedType.isMappedAnnotation(rootType)
-                || (resolvedType.declaration as? KSClassDeclaration)?.classKind == ClassKind.ENUM_CLASS
-            ) {
-                ClassName("", declaration.simpleName.asString())
-            } else {
-                KSAnnotation::class.asClassName()
+            when {
+                resolvedType.isMappedAnnotation(rootType) -> ClassName("", declaration.simpleName.asString())
+                (resolvedType.declaration as? KSClassDeclaration)?.classKind == ClassKind.ENUM_CLASS -> (declaration as KSClassDeclaration).toClassName()
+                else -> KSAnnotation::class.asClassName()
             }
         }
     }

diff --git a/ksp/src/main/kotlin/annotations/AnnotationArguments.kt b/ksp/src/main/kotlin/annotations/AnnotationArguments.kt
@@ -224,6 +224,6 @@ public class AnnotationArguments<A : Annotation> private constructor(
          * @see AnnotationArguments
          */
         public fun <A : Annotation> KSAnnotation.arguments(): AnnotationArguments<A> =
-            AnnotationArguments(arguments.associateBy { it.name!!.asString() })
+            AnnotationArguments(defaultArguments.associateBy { it.name!!.asString() } + arguments.associateBy { it.name!!.asString() })
     }
 }
diff --git a/ksp/src/test/kotlin/MockAnnotation.kt b/ksp/src/test/kotlin/MockAnnotation.kt
@@ -28,4 +28,5 @@ private fun mockValueArgumentInternal(name: String, value: Any?, origin: Origin
 
 fun mockAnnotation() = mockk<KSAnnotation> {
     every { arguments } returns _arguments
+    every { defaultArguments } returns _arguments
 }