switched to dev.zacsweers.kctfork for k2 kotlin-compile-testing

Author: Jolanrensen

gradle/libs.versions.toml

@@ -53,7 +53,7 @@ plugin-publish = "1.3.0"
 shadow = "8.3.5"
 android-gradle-api = "7.3.1" # need to revise our tests to update
 ktor = "3.0.1" # needs jupyter compatibility with Kotlin 2.1 to update
-kotlin-compile-testing = "1.6.0"
+kotlin-compile-testing = "0.7.1"
 duckdb = "1.1.3"
 buildconfig = "5.6.7"
 benchmark = "0.4.12"
@@ -152,8 +152,8 @@ android-gradle = { group = "com.android.tools.build", name = "gradle", version.r
 kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin" }
 kotlin-gradle-plugin-api = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin-api" }
 ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty", version.ref = "ktor" }
-kotlin-compile-testing = { group = "com.github.tschuchortdev", name = "kotlin-compile-testing", version.ref = "kotlin-compile-testing" }
-kotlin-compile-testing-ksp = { group = "com.github.tschuchortdev", name = "kotlin-compile-testing-ksp", version.ref = "kotlin-compile-testing" }
+kotlin-compile-testing = { group = "dev.zacsweers.kctfork", name = "core", version.ref = "kotlin-compile-testing" }
+kotlin-compile-testing-ksp = { group = "dev.zacsweers.kctfork", name = "ksp", version.ref = "kotlin-compile-testing" }
 kotlin-compiler = { group = "org.jetbrains.kotlin", name = "kotlin-compiler", version.ref = "kotlin" }
 kotlin-compiler-embeddable = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-embeddable", version.ref = "kotlin" }
 kotlin-compiler-internal-test-framework = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-internal-test-framework", version.ref = "kotlin" }

plugins/symbol-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/DataFrameSymbolProcessorTest.kt

@@ -1218,11 +1218,6 @@ class DataFrameSymbolProcessorTest {
 
                             fun resolved() {
                                 JetBrains
-                                JetBrains1
-                                JetBrains2
-                                JetBrains3
-                                JetBrains4
-                                JetBrains5
                             }
                             """.trimIndent(),
                         ),
@@ -1268,11 +1263,11 @@ class DataFrameSymbolProcessorTest {
             )
             println(result.kspGeneratedFiles)
             result.inspectLines("MetricsNoKeyValue.Generated.kt") {
-//            (('1'..'5') + "").forEach { nr ->
-//                it.forAtLeastOne {
-//                    it shouldContain "JetBrains$nr"
-//                }
-//            }
+                (('1'..'3') + "").forEach { nr ->
+                    it.forAtLeastOne {
+                        it shouldContain "MetricsNoKeyValue$nr"
+                    }
+                }
             }
         }
 

plugins/symbol-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/runner/KspCompilationTestRunner.kt

@@ -2,11 +2,13 @@
 
 package org.jetbrains.dataframe.ksp.runner
 
+import com.tschuchort.compiletesting.JvmCompilationResult
 import com.tschuchort.compiletesting.KotlinCompilation
 import com.tschuchort.compiletesting.SourceFile
-import com.tschuchort.compiletesting.kspArgs
+import com.tschuchort.compiletesting.kspProcessorOptions
 import com.tschuchort.compiletesting.kspSourcesDir
 import com.tschuchort.compiletesting.symbolProcessorProviders
+import com.tschuchort.compiletesting.useKsp2
 import org.jetbrains.dataframe.ksp.DataFrameSymbolProcessorProvider
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import java.io.ByteArrayOutputStream
@@ -15,7 +17,7 @@ import java.nio.file.Paths
 
 @Suppress("unused")
 internal class KotlinCompileTestingCompilationResult(
-    val delegate: KotlinCompilation.Result,
+    val delegate: JvmCompilationResult,
     val successfulCompilation: Boolean,
     val kspGeneratedFiles: List<File>,
     val outputSourceDirs: List<File>,
@@ -43,8 +45,14 @@ internal object KspCompilationTestRunner {
             classpaths = params.classpath,
             tempDir = compilationDir,
         )
-        kspCompilation.kspArgs.putAll(params.options)
-        kspCompilation.symbolProcessorProviders = listOf(DataFrameSymbolProcessorProvider())
+        kspCompilation.kspProcessorOptions.putAll(params.options)
+
+        // We don't support KSP2, but because we target Kotlin 2.2 the tests only work if I set them up like this.
+        kspCompilation.useKsp2()
+        kspCompilation.kspProcessorOptions["ksp.useKSP2"] = "false"
+        kspCompilation.kspProcessorOptions["useKSP2"] = "false"
+
+        kspCompilation.symbolProcessorProviders = mutableListOf(DataFrameSymbolProcessorProvider())
         kspCompilation.compile().also {
             println(it.messages)
             if (it.exitCode == KotlinCompilation.ExitCode.COMPILATION_ERROR) {