2.3.0-1.10.0-rc02-6

- Fixes `Processor` bug when fetching annotations parameters

Author: GuilhE

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [2.3.0-1.10.0-rc02-6]
+
+- Fixes `Processor` bug when fetching annotations parameters
+
+---
+
 ## [2.3.0-1.10.0-rc02-5]
 
 - Adds `opaque` property to `@ComposeUIViewController` to activate `ComposeUIViewController` `opaque` configuration.

CHANGELOG_PLUGIN.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [2.3.0-1.10.0-rc02-6]
+
+- Compatible with 2.3.0-1.10.0-rc02-6
+
+---
+
 ## [2.3.0-1.10.0-rc02-5]
 
 - Compatible with 2.3.0-1.10.0-rc02-5

README.md

@@ -6,7 +6,7 @@ KSP library and Gradle plugin for generating `ComposeUIViewController` and `UIVi
 
 | Version               | Kotlin |  KSP  | Compose Multiplatform | Xcode  |
 |-----------------------|:------:|:-----:|:---------------------:|:------:|
-| `2.3.0-1.10.0-rc02-5` | 2.3.0  | 2.3.4 |      1.10.0-rc02      | 26.2.0 |
+| `2.3.0-1.10.0-rc02-6` | 2.3.0  | 2.3.4 |      1.10.0-rc02      | 26.2.0 |
 
 [![Android Weekly](https://androidweekly.net/issues/issue-583/badge)](https://androidweekly.net/issues/issue-583) [![Featured in Kotlin Weekly - Issue #378](https://img.shields.io/badge/Featured_in_Kotlin_Weekly-Issue_%23378-7878b4)](https://mailchi.mp/kotlinweekly/kotlin-weekly-378) [![Featured in Kotlin Weekly - Issue #389](https://img.shields.io/badge/Featured_in_Kotlin_Weekly-Issue_%23389-7878b4)](https://mailchi.mp/kotlinweekly/kotlin-weekly-389) <a href="https://jetc.dev/issues/177.html"><img src="https://img.shields.io/badge/As_Seen_In-jetc.dev_Newsletter_Issue_%23177-blue?logo=Jetpack+Compose&amp;logoColor=white" alt="As Seen In - jetc.dev Newsletter Issue #177"></a> <a href="https://jetc.dev/issues/188.html"><img src="https://img.shields.io/badge/As_Seen_In-jetc.dev_Newsletter_Issue_%23188-blue?logo=Jetpack+Compose&amp;logoColor=white" alt="As Seen In - jetc.dev Newsletter Issue #188"></a>
 
@@ -201,7 +201,7 @@ For a working [sample](sample) open `iosApp/Gradient.xcodeproj` in Xcode and run
 
 You'll find three different use cases:
 - `GradientScreenCompose`: A screen rendered entirely in Compose with its state controlled by iOS;
-- `GradientScreenMixed`: A screen rendered in Compose with a Swift UIViewController embedded in it;
+- `GradientScreenMixed`: A screen rendered in Compose with a SwiftUI View embedded in it;
 - `GradientScreenSwift`: A screen rendered entirely in Swift and embedded in Compose.
 
 You can also find other working samples in:  

build.gradle.kts

@@ -15,7 +15,7 @@ buildscript {
 
 allprojects {
     group = "com.github.guilhe.kmp"
-    version = "2.3.0-1.10.0-rc02-5"
+    version = "2.3.0-1.10.0-rc02-6"
 }
 
 dependencies {

kmp-composeuiviewcontroller-gradle-plugin/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
     testImplementation(libs.test.kotlin)
 }
 
-version = "2.3.0-1.10.0-rc02-5"
+version = "2.3.0-1.10.0-rc02-6"
 group = "io.github.guilhe.kmp"
 
 gradlePlugin {

kmp-composeuiviewcontroller-gradle-plugin/src/main/kotlin/com/github/guilhe/kmp/composeuiviewcontroller/gradle/KmpComposeUIViewControllerPlugin.kt

@@ -313,7 +313,7 @@ public class KmpComposeUIViewControllerPlugin : Plugin<Project> {
         listOf(iosAppFolderName, iosAppName, targetName, autoExport, exportFolderName)
 
     internal companion object {
-        private const val VERSION_LIBRARY = "2.3.0-1.10.0-rc02-5"
+        private const val VERSION_LIBRARY = "2.3.0-1.10.0-rc02-6"
         private const val LOG_TAG = "KmpComposeUIViewControllerPlugin"
         internal const val PLUGIN_KMP = "org.jetbrains.kotlin.multiplatform"
         internal const val PLUGIN_KSP = "com.google.devtools.ksp"

kmp-composeuiviewcontroller-ksp/src/main/kotlin/com/github/guilhe/kmp/composeuiviewcontroller/ksp/Processor.kt

@@ -14,6 +14,7 @@ import com.google.devtools.ksp.processing.SymbolProcessor
 import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
 import com.google.devtools.ksp.processing.SymbolProcessorProvider
 import com.google.devtools.ksp.symbol.KSAnnotated
+import com.google.devtools.ksp.symbol.KSAnnotation
 import com.google.devtools.ksp.symbol.KSFunctionDeclaration
 import com.google.devtools.ksp.symbol.KSValueParameter
 import kotlinx.serialization.json.Json
@@ -73,11 +74,11 @@ internal class Processor(
                     }
 
                     val frameworkBaseNames = if (swiftExportEnabled) {
-                        getFrameworkBaseNames(composable, node, makeParameters, parameters, modulesMetadata, stateParameter)
+                        getFrameworkBaseNames(composable, makeParameters, parameters, modulesMetadata, stateParameter)
                     } else {
-                        listOf(trimFrameworkBaseNames(node, modulesMetadata, packageName))
+                        listOf(trimFrameworkBaseNames(composable, modulesMetadata, packageName))
                     }
-                    val opaqueConfiguration = getOpaqueConfigurationFromAnnotation(node)
+                    val opaqueConfiguration = getOpaqueConfigurationFromAnnotation(composable.annotations)
 
                     if (stateParameter == null) {
                         createKotlinFileWithoutState(packageName, externalImports, composable, makeParameters, parameters, opaqueConfiguration).also {
@@ -95,7 +96,14 @@ internal class Processor(
                     } else {
                         val stateParameterName = stateParameter.name()
                         createKotlinFileWithState(
-                            packageName, externalImports, composable, stateParameterName, stateParameter, makeParameters, parameters, opaqueConfiguration
+                            packageName,
+                            externalImports,
+                            composable,
+                            stateParameterName,
+                            stateParameter,
+                            makeParameters,
+                            parameters,
+                            opaqueConfiguration
                         ).also {
                             logger.info("${composable.name()}UIViewController created!")
                         }
@@ -216,28 +224,27 @@ internal class Processor(
             .toMap()
     }
 
-    private fun trimFrameworkBaseNames(node: KSAnnotated, moduleMetadata: List<ModuleMetadata>, packageName: String): String {
+    private fun trimFrameworkBaseNames(composable: KSFunctionDeclaration, moduleMetadata: List<ModuleMetadata>, packageName: String): String {
         val framework = moduleMetadata.firstOrNull { it.packageNames.any { p -> p.startsWith(packageName) } }?.frameworkBaseName ?: ""
-        framework.ifEmpty { return getFrameworkBaseNameFromAnnotation(node) ?: throw EmptyFrameworkBaseNameException() }
+        framework.ifEmpty { return getFrameworkBaseNameFromAnnotation(composable.annotations) ?: throw EmptyFrameworkBaseNameException() }
         return framework
     }
 
     private fun getFrameworkBaseNames(
         composable: KSFunctionDeclaration,
-        node: KSAnnotated,
         makeParameters: List<KSValueParameter>,
         parameters: List<KSValueParameter>,
         modulesMetadata: List<ModuleMetadata>,
         stateParameter: KSValueParameter? = null
     ): List<String> {
         return extractFrameworkBaseNames(composable, modulesMetadata, makeParameters, parameters, stateParameter)
             .filter { it.isNotBlank() }
-            .ifEmpty { listOfNotNull(getFrameworkBaseNameFromAnnotation(node)) }
+            .ifEmpty { listOfNotNull(getFrameworkBaseNameFromAnnotation(composable.annotations)) }
             .ifEmpty { throw EmptyFrameworkBaseNameException() }
     }
 
-    private fun getFrameworkBaseNameFromAnnotation(node: KSAnnotated): String? {
-        val annotation = node.annotations.firstOrNull { it.shortName.asString() == composeUIViewControllerAnnotationName.name() }
+    private fun getFrameworkBaseNameFromAnnotation(annotations: Sequence<KSAnnotation>): String? {
+        val annotation = annotations.firstOrNull { it.shortName.asString() == composeUIViewControllerAnnotationName.name() }
         if (annotation != null) {
             val argument = annotation.arguments.firstOrNull { it.name?.asString() == frameworkBaseNameAnnotationParameter }
             if (argument != null) {
@@ -250,8 +257,8 @@ internal class Processor(
         return null
     }
 
-    private fun getOpaqueConfigurationFromAnnotation(node: KSAnnotated): Boolean {
-        val annotation = node.annotations.firstOrNull { it.shortName.asString() == composeUIViewControllerAnnotationName.name() }
+    private fun getOpaqueConfigurationFromAnnotation(annotations: Sequence<KSAnnotation>): Boolean {
+        val annotation = annotations.firstOrNull { it.shortName.asString() == composeUIViewControllerAnnotationName.name() }
         if (annotation != null) {
             val argument = annotation.arguments.firstOrNull { it.name?.asString() == composeUIViewControllerOpaqueConfiguration }
             if (argument != null) {

sample/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 kotlin = "2.3.0"
-composeMultiplatform = "1.11.0-alpha01"
+composeMultiplatform = "1.10.0-rc02"
 
 composeMaterial3 = "1.9.0"
 kotlinxCollections = "0.4.0"