Merge pull request #592 from Kotlin/ksp-fix

Ksp fix

Author: Jolanrensen

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-ksp = "1.9.21-1.0.15"
+ksp = "1.9.22-1.0.17"
 kotlinJupyter = "0.11.0-358"
 ktlint = "3.4.5"
-kotlin = "1.9.0"
+kotlin = "1.9.22"
 dokka = "1.8.10"
 libsPublisher = "0.0.60-dev-30"
 # "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs,

plugins/dataframe-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/ConvenienceSchemaGeneratorPlugin.kt

@@ -3,7 +3,8 @@ package org.jetbrains.dataframe.gradle
 import com.google.devtools.ksp.gradle.KspExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.findByType
+import org.gradle.api.artifacts.UnknownConfigurationException
+import org.gradle.kotlin.dsl.getByType
 import java.util.*
 
 @Suppress("unused")
@@ -20,11 +21,43 @@ class ConvenienceSchemaGeneratorPlugin : Plugin<Project> {
                 target.logger.warn("Invalid value '$property' for '$name' property. Defaulting to '$addKsp'. Please use 'true' or 'false'.")
             }
         }
+
+        val properties = Properties()
+        properties.load(javaClass.getResourceAsStream("plugin.properties"))
+        val preprocessorVersion = properties.getProperty("PREPROCESSOR_VERSION")
+
+        // regardless whether we add KSP or the user adds it, when it's added,
+        // configure it to depend on symbol-processor-all
+        target.plugins.whenPluginAdded {
+            if ("com.google.devtools.ksp" in this.javaClass.packageName) {
+                try {
+                    target.configurations.getByName("ksp").dependencies.add(
+                        target.dependencies.create("org.jetbrains.kotlinx.dataframe:symbol-processor-all:$preprocessorVersion")
+                    )
+                } catch (e: UnknownConfigurationException) {
+                    target.logger.warn("Configuration 'ksp' not found. Please make sure the KSP plugin is applied.")
+                }
+                try {
+                    target.configurations.getByName("kspTest").dependencies.add(
+                        target.dependencies.create("org.jetbrains.kotlinx.dataframe:symbol-processor-all:$preprocessorVersion")
+                    )
+                } catch (e: UnknownConfigurationException) {
+                    target.logger.warn("Configuration 'kspTest' not found. Please make sure the KSP plugin is applied.")
+                }
+                target.logger.info("Added DataFrame dependency to the KSP plugin.")
+                target.extensions.getByType<KspExtension>().arg("dataframe.resolutionDir", target.projectDir.absolutePath)
+            }
+        }
+
         if (addKsp) {
             target.plugins.apply(KspPluginApplier::class.java)
-        }
-        target.afterEvaluate {
-            target.extensions.findByType<KspExtension>()?.arg("dataframe.resolutionDir", target.projectDir.absolutePath)
+        } else {
+            target.logger.warn(
+                "Plugin 'org.jetbrains.kotlinx.dataframe' comes bundled with its own version of KSP which is " +
+                    "currently disabled as 'kotlin.dataframe.add.ksp' is set to 'false' in a 'properties' file. " +
+                    "Either set 'kotlin.dataframe.add.ksp' to 'true' or add the plugin 'com.google.devtools.ksp' " +
+                    "manually."
+            )
         }
         target.plugins.apply(SchemaGeneratorPlugin::class.java)
     }
@@ -38,14 +71,13 @@ class DeprecatingSchemaGeneratorPlugin : Plugin<Project> {
     }
 }
 
+/**
+ * Applies the KSP plugin in the target project.
+ */
 internal class KspPluginApplier : Plugin<Project> {
     override fun apply(target: Project) {
         val properties = Properties()
         properties.load(javaClass.getResourceAsStream("plugin.properties"))
-        val preprocessorVersion = properties.getProperty("PREPROCESSOR_VERSION")
         target.plugins.apply("com.google.devtools.ksp")
-        target.configurations.getByName("ksp").dependencies.add(
-            target.dependencies.create("org.jetbrains.kotlinx.dataframe:symbol-processor-all:$preprocessorVersion")
-        )
     }
 }

plugins/dataframe-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/SchemaGeneratorPlugin.kt

@@ -1,5 +1,6 @@
 package org.jetbrains.dataframe.gradle
 
+import com.google.devtools.ksp.gradle.KspTaskJvm
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
@@ -36,11 +37,16 @@ class SchemaGeneratorPlugin : Plugin<Project> {
                 target.logger.warn("Schema generator plugin applied, but no Kotlin plugin was found")
             }
 
-            val generationTasks = extension.schemas.map { createTask(target, extension, appliedPlugin, it) }
+            val generationTasks = extension.schemas.map {
+                createTask(target, extension, appliedPlugin, it)
+            }
             val generateAll = target.tasks.create("generateDataFrames") {
                 group = GROUP
                 dependsOn(*generationTasks.toTypedArray())
             }
+            tasks.withType(KspTaskJvm::class.java).configureEach {
+                dependsOn(generateAll)
+            }
             tasks.withType<KotlinCompile> {
                 dependsOn(generateAll)
             }
@@ -69,7 +75,18 @@ class SchemaGeneratorPlugin : Plugin<Project> {
                 appliedPlugin ?: propertyError("src")
                 val sourceSet = appliedPlugin.kotlinExtension.sourceSets.getByName(sourceSetName)
                 val src = target.file(Paths.get("build/generated/dataframe/", sourceSetName, "kotlin").toFile())
+
+                // Add the new sources to the source set
                 sourceSet.kotlin.srcDir(src)
+
+                // Configure the right ksp task to be aware of these new sources
+                val kspTaskName = "ksp${sourceSetName.replaceFirstChar { it.uppercase() }}Kotlin"
+                target.tasks.withType(KspTaskJvm::class.java).configureEach {
+                    if (sourceSetName == "main" && name == "kspKotlin" || name == kspTaskName) {
+                        source(src)
+                    }
+                }
+
                 src
             }
 

plugins/expressions-converter/src/org/jetbrains/kotlinx/dataframe/ExplainerIrTransformer.kt

@@ -222,7 +222,7 @@ class ExplainerIrTransformer(
                     add(data.function?.name?.asString().irConstImpl())
                     add(IrConstImpl.int(-1, -1, pluginContext.irBuiltIns.intType, data.statementIndex))
                 }
-                body = pluginContext.irFactory.createBlockBody(-1, -1) {
+                body = pluginContext.irFactory.createBlockBody(-1, -1).apply {
                     val callback = FqName("org.jetbrains.kotlinx.dataframe.explainer.PluginCallbackProxy.doAction")
                     val doAction = pluginContext.referenceFunctions(callback).single()
                     statements += IrCallImpl(