switching to dev.zacsweers.kctfork for kotlin compile testing

Author: Jolanrensen

gradle.properties

@@ -3,6 +3,8 @@ version=1.0.0
 jupyterApiTCRepo=
 kotlin.jupyter.add.scanner=false
 org.gradle.jvmargs=-Xmx4G
+
+# We don't support ksp2
 ksp.useKSP2=false
 
 # build.number.detection=false

gradle/libs.versions.toml

@@ -13,6 +13,7 @@ libsPublisher = "1.9.23-dev-45"
 # "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs,
 # dogfood Gradle / KSP plugins in tests and idea-examples modules
 dataframe = "1.0.0-dev-6538"
+#dataframe = "1.0.0-dev"
 korro = "0.1.6"
 
 binaryCompatibilityValidator = "0.17.0"
@@ -51,7 +52,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.5.1"
 benchmark = "0.4.12"
@@ -138,8 +139,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/dataframe-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/SchemaGeneratorPlugin.kt

@@ -39,7 +39,7 @@ class SchemaGeneratorPlugin : Plugin<Project> {
             val generationTasks = extension.schemas.map {
                 createTask(target, extension, appliedPlugin, it)
             }
-            val generateAll = target.tasks.create("generateDataFrames") {
+            val generateAll = target.tasks.register("generateDataFrames") {
                 group = GROUP
                 dependsOn(*generationTasks.toTypedArray())
             }
@@ -124,7 +124,7 @@ class SchemaGeneratorPlugin : Plugin<Project> {
         val defaultPath = schema.defaultPath ?: extension.defaultPath ?: true
         val delimiters = schema.withNormalizationBy ?: extension.withNormalizationBy ?: setOf('\t', ' ', '_')
 
-        return target.tasks.create("generateDataFrame$interfaceName", GenerateDataSchemaTask::class.java) {
+        return target.tasks.register("generateDataFrame$interfaceName", GenerateDataSchemaTask::class.java) {
             (logging as? DefaultLoggingManager)?.setLevelInternal(LogLevel.QUIET)
             group = GROUP
             data.set(schema.data)
@@ -138,7 +138,7 @@ class SchemaGeneratorPlugin : Plugin<Project> {
             this.defaultPath.set(defaultPath)
             this.delimiters.set(delimiters)
             this.enableExperimentalOpenApi.set(extension.enableExperimentalOpenApi)
-        }
+        }.get()
     }
 
     private fun getInterfaceName(schema: Schema): String? {

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

@@ -2,9 +2,10 @@
 
 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 org.jetbrains.dataframe.ksp.DataFrameSymbolProcessorProvider
@@ -15,7 +16,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 +44,8 @@ internal object KspCompilationTestRunner {
             classpaths = params.classpath,
             tempDir = compilationDir,
         )
-        kspCompilation.kspArgs.putAll(params.options)
-        kspCompilation.symbolProcessorProviders = listOf(DataFrameSymbolProcessorProvider())
+        kspCompilation.kspProcessorOptions.putAll(params.options)
+        kspCompilation.symbolProcessorProviders = mutableListOf(DataFrameSymbolProcessorProvider())
         kspCompilation.compile().also {
             println(it.messages)
             if (it.exitCode == KotlinCompilation.ExitCode.COMPILATION_ERROR) {