feat: update Kotlin version and dependencies, enhance NavParam annotation, and improve KSP test utilities (#458)

Author: wax911

.idea/kotlinc.xml

@@ -0,0 +1 @@
+21.0.8

.java-version

@@ -1,3 +1,12 @@
 plugins {
     id("co.anitrend.arch")
+    kotlin("jvm")
+}
+
+kotlin {
+    sourceSets {
+        main {
+            kotlin.srcDirs("src/main/kotlin")
+        }
+    }
 }

annotation/build.gradle.kts

@@ -24,7 +24,7 @@ package co.anitrend.arch.annotation
  * @since 1.8.0
  */
 @Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
+@Retention(AnnotationRetention.BINARY)
 annotation class NavParam(
     val enabled: Boolean = true,
 )

annotation/src/main/kotlin/co/anitrend/arch/annotation/NavParam.kt

@@ -23,9 +23,9 @@ import co.anitrend.arch.extension.util.date.contract.AbstractSupportDateHelper
 import com.jakewharton.threetenabp.AndroidThreeTen
 import java.util.Locale
 import java.util.TimeZone
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.BeforeEach
-import kotlin.test.Test
+import org.junit.Before
+import org.junit.Test
+import org.junit.Assert.assertEquals
 import org.junit.runner.RunWith
 import org.threeten.bp.format.DateTimeFormatter
 
@@ -44,7 +44,7 @@ class AbstractSupportDateHelperTest {
         InstrumentationRegistry.getInstrumentation().context
     }
 
-    @BeforeEach
+    @Before
     fun setUp() {
         AndroidThreeTen.init(context)
     }

extension/src/androidTest/kotlin/co/anitrend/arch/extension/util/AbstractSupportDateHelperTest.kt

@@ -18,7 +18,7 @@ jetbrains-kotlinx-coroutines = "1.10.2"
 
 io-mockk = "1.14.2"
 
-google-devtools-ksp = "2.1.20-1.0.32"
+google-devtools-ksp = "2.0.21-1.0.27"
 
 [plugins]
 google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "google-devtools-ksp" }
@@ -89,4 +89,4 @@ pintrest-ktlint = { module = "com.pinterest:ktlint", version.ref = "ktlint" }
 
 squareup-kotlinpoet = { module = "com.squareup:kotlinpoet", version = "2.0.0" }
 google-devtools-ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "google-devtools-ksp" }
-kotlin-compile-testing-ksp = { module = "com.github.tschuchortdev:kotlin-compile-testing-ksp", version = "1.6.0" }
+kotlin-compile-testing-ksp = { module = "dev.zacsweers.kctfork:ksp", version = "0.6.0" }

gradle/libs.versions.toml

@@ -4,18 +4,14 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":annotation"))
+    api(project(":annotation"))
     implementation(libs.squareup.kotlinpoet)
     implementation(libs.google.devtools.ksp.api)
 
     testImplementation(libs.jetbrains.kotlin.test)
     testImplementation(libs.kotlin.compile.testing.ksp)
 }
 
-tasks.withType(Test::class.java) {
-    dependsOn(":annotation:classesJar")
-}
-
 tasks.test {
     useJUnitPlatform()
 }

processor/build.gradle.kts

@@ -69,6 +69,8 @@ class NavParamCodeGenerator(
     ) {
         val fileSpec = generateContent(classes = classes, spec = spec)
 
+        logger.logging("[NavParamCodeGenerator] Generating file: ${spec.packageName}.${spec.fileName}.kt for ${classes.size} classes")
+
         val file =
             codeGenerator.createNewFile(
                 dependencies =
@@ -92,12 +94,17 @@ class NavParamCodeGenerator(
     }
 
     override operator fun invoke(classes: List<KSClassDeclaration>) {
-        val packageName = classes.first().packageName.asString()
+        val classDeclaration = classes.first()
+        val packageName = classDeclaration.packageName.asString()
         val parentClassName =
-            classes.first().parentDeclaration?.simpleName?.asString()
-                ?: throw UnsupportedOperationException(
-                    "The annotated item in `$packageName` should belong in a parent class",
-                )
+            classDeclaration.parentDeclaration?.simpleName?.asString()
+                ?: run {
+                    logger.error(
+                        "The annotated item in `$packageName` should belong in a parent class",
+                        classDeclaration,
+                    )
+                    return
+                }
 
         val spec =
             Spec(

processor/src/main/kotlin/co/anitrend/arch/processor/codegen/NavParamCodeGenerator.kt

@@ -1,10 +1,11 @@
 package co.anitrend.arch.processor.utils
 
 import com.google.devtools.ksp.processing.SymbolProcessorProvider
+import com.tschuchort.compiletesting.JvmCompilationResult
 import com.tschuchort.compiletesting.KotlinCompilation
 import com.tschuchort.compiletesting.SourceFile
-import com.tschuchort.compiletesting.kspWithCompilation
 import com.tschuchort.compiletesting.symbolProcessorProviders
+import com.tschuchort.compiletesting.useKsp2
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import java.io.File
 
@@ -14,17 +15,17 @@ object KspTestUtil {
     fun compile(
         sourceFiles: List<SourceFile>,
         symbolProcessorProviders: List<SymbolProcessorProvider>,
-    ): KotlinCompilation.Result {
+    ): JvmCompilationResult {
         return KotlinCompilation().also { compiler ->
             compiler.sources = sourceFiles
             compiler.inheritClassPath = true
-            compiler.symbolProcessorProviders = symbolProcessorProviders
+            compiler.useKsp2()
+            compiler.symbolProcessorProviders += symbolProcessorProviders
             compiler.messageOutputStream = System.out
-            compiler.kspWithCompilation = true
         }.compile()
     }
 
-    fun getSourcesFromResult(result: KotlinCompilation.Result): List<File> {
+    fun getSourcesFromResult(result: JvmCompilationResult): List<File> {
         val kspSourcesDir = result.outputDirectory.resolve("../ksp/sources")
         return kspSourcesDir.walkTopDown()
             .filter { it.isFile && it.extension == "kt" }