Fix ksp

Author: adriangl

CHANGELOG.md

@@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
-- No new features!
+- KSP support is now stable and no longer experimental. You can now use KSP by following the instructions in the [README](README.md).
 ### Changed
 - Update the project to use KTS scripts, convention plugins, version catalogs and other modern Gradle and Android features.
 ### Deprecated

README.md

@@ -42,7 +42,7 @@ Then, add the following dependencies to your module's `build.gradle`:
 
 ```groovy
 dependencies {
-    def mini_version = "3.1.0"
+    def mini_version = "<latest_version>"
     // Minimum working dependencies
     implementation "com.github.hyperdevs-team.mini-kotlin:mini-android:$mini_version"
     // Use kapt as your annotation processor
@@ -68,7 +68,7 @@ dependencies {
 
 ```kotlin
 dependencies {
-    val miniVersion = "3.1.0"
+    val miniVersion = "<latest_version>"
     // Minimum working dependencies
     implementation("com.github.hyperdevs-team.mini-kotlin:mini-android:$miniVersion")
     // Use kapt as your annotation processor
@@ -90,9 +90,8 @@ dependencies {
 
 </details>
 
-If you want, you can also use *Kotlin Symbol Processing (KSP)* instead of KAPT. Keep in mind that
-support for it is **EXPERIMENTAL** and that 
-[KSP has some gotchas that can be worked around](#ksp-gotchas), so double check before using this
+If you want, you can also use *Kotlin Symbol Processing (KSP)* instead of KAPT. Keep in mind that 
+[KSP may have some gotchas that can be worked around](#ksp-gotchas), so double check before using this
 and report any issue that you find while working with KSP.
 
 <details><summary>KSP extra dependencies</summary>
@@ -104,7 +103,7 @@ Add this to your main `build.gradle`:
 ```groovy
 buildscript {
     ext {
-        ksp_version = <latest_ksp_version>
+        ksp_version = "<latest_ksp_version>"
     }
 
     dependencies {

app/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.kapt)
+    // alias(libs.plugins.kotlin.kapt)
     alias(libs.plugins.kotlin.ksp)
     alias(libs.plugins.convention.androidApp)
 }
@@ -59,8 +59,8 @@ dependencies {
     implementation(project(":mini-android"))
     implementation(project(":mini-kodein-android"))
 
-    kapt(project(":mini-processor"))
-    //ksp(project(":mini-processor"))
+    // kapt(project(":mini-processor"))
+    ksp(project(":mini-processor"))
 
     // Kotlin
     implementation(libs.kotlin.stdlib)

mini-processor/src/main/java/mini/processor/ksp/MiniSymbolProcessor.kt

@@ -4,6 +4,7 @@ import com.google.devtools.ksp.processing.CodeGenerator
 import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.processing.SymbolProcessor
 import com.google.devtools.ksp.symbol.KSAnnotated
+import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.squareup.kotlinpoet.ksp.writeTo
 import mini.Action
 import mini.Reducer
@@ -23,17 +24,21 @@ class MiniSymbolProcessor(
         val actionSymbols = resolver.getSymbolsWithAnnotation(Action::class.java.canonicalName)
         val reducerSymbols = resolver.getSymbolsWithAnnotation(Reducer::class.java.canonicalName)
 
+        // Collect the files that contain the symbols, we will use this to set the originating files
+        // for the generated code and incremental processing.
+        val originatingKsFiles = (actionSymbols + reducerSymbols).
+            filterIsInstance<KSClassDeclaration>()
+            .mapNotNull { it.containingFile }
+            .distinct()
+            .toList()
+
         if (!actionSymbols.iterator().hasNext()) return emptyList()
 
         val (containerFile, container) = getContainerBuilders()
 
         try {
-            ActionTypesGenerator(KspActionTypesGeneratorDelegate(actionSymbols)).generate(
-                container
-            )
-            ReducersGenerator(KspReducersGeneratorDelegate(reducerSymbols)).generate(
-                container
-            )
+            ActionTypesGenerator(KspActionTypesGeneratorDelegate(actionSymbols)).generate(container)
+            ReducersGenerator(KspReducersGeneratorDelegate(reducerSymbols)).generate(container)
         } catch (e: Throwable) {
             if (e !is ProcessorException) {
                 kspLogError(
@@ -46,7 +51,11 @@ class MiniSymbolProcessor(
         containerFile
             .addType(container.build())
             .build()
-            .writeTo(codeGenerator, true)
+            .writeTo(
+                codeGenerator = codeGenerator,
+                aggregating = true,
+                originatingKSFiles = originatingKsFiles
+            )
 
         return emptyList()
     }