fixup! fixup! tiny fixes for kotlin 2.2 in gradle plugin

Author: Jolanrensen

build.gradle.kts

@@ -208,6 +208,7 @@ allprojects {
             configure<BuildConfigExtension> {
                 packageName = "org.jetbrains.kotlinx.dataframe"
                 className = "BuildConfig"
+                buildConfigField("KOTLIN_VERSION", libs.versions.kotlin.asProvider().get())
                 buildConfigField("VERSION", "${project.version}")
                 buildConfigField("DEBUG", findProperty("kotlin.dataframe.debug")?.toString()?.toBoolean() ?: false)
             }

plugins/dataframe-gradle-plugin/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     `kotlin-dsl`
-    `java-gradle-plugin`
     `maven-publish`
+    alias(libs.plugins.buildconfig)
     alias(libs.plugins.plugin.publish)
     alias(libs.plugins.ktlint)
 }
@@ -14,26 +14,34 @@ repositories {
 
 group = "org.jetbrains.kotlinx.dataframe"
 
+buildscript {
+    dependencies {
+        classpath(embeddedKotlin("gradle-plugin"))
+    }
+}
+
 dependencies {
     api(libs.kotlin.reflect)
     implementation(projects.dataframe)
     // experimental
     implementation(projects.dataframeOpenapiGenerator)
 
+    compileOnly(embeddedKotlin("gradle-plugin"))
     implementation(libs.kotlin.gradle.plugin.api)
-    compileOnly(libs.kotlin.gradle.plugin)
     implementation(libs.serialization.core)
     implementation(libs.serialization.json)
     implementation(libs.ksp.gradle)
     implementation(libs.ksp.api)
 
-    testImplementation(libs.junit)
+    testImplementation(gradleTestKit())
+    testImplementation(embeddedKotlin("test"))
+    testImplementation(embeddedKotlin("test-junit"))
     testImplementation(libs.kotestAssertions)
     testImplementation(libs.android.gradle.api)
     testImplementation(libs.android.gradle)
+    testImplementation(embeddedKotlin("gradle-plugin"))
     testImplementation(libs.ktor.server.netty)
     testImplementation(libs.h2db)
-    testImplementation(gradleApi())
 }
 
 tasks.withType<ProcessResources> {
@@ -100,6 +108,10 @@ val integrationTestConfiguration by configurations.creating {
     extendsFrom(configurations.testImplementation.get())
 }
 
+tasks.pluginUnderTestMetadata {
+    pluginClasspath.from(integrationTestConfiguration)
+}
+
 val integrationTestTask = tasks.register<Test>("integrationTest") {
     dependsOn(":plugins:symbol-processor:publishToMavenLocal")
     dependsOn(":dataframe-arrow:publishToMavenLocal")

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

@@ -1,5 +1,7 @@
 package org.jetbrains.dataframe.gradle
 
+import com.google.devtools.ksp.gradle.KspAATask
+import com.google.devtools.ksp.gradle.KspTask
 import com.google.devtools.ksp.gradle.KspTaskJvm
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -13,7 +15,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.tasks.BaseKotlinCompile
 import java.io.File
 import java.net.URL
 import java.nio.file.Path
@@ -42,10 +44,15 @@ class SchemaGeneratorPlugin : Plugin<Project> {
                 group = GROUP
                 dependsOn(*generationTasks.toTypedArray())
             }
-            tasks.withType(KspTaskJvm::class.java).configureEach {
+            tasks.withType(KspTask::class.java).configureEach {
                 dependsOn(generateAll)
+                dependsOn(*generationTasks.toTypedArray())
+            }
+            tasks.withType(KspAATask::class.java).configureEach {
+                dependsOn(generateAll)
+                dependsOn(*generationTasks.toTypedArray())
             }
-            tasks.withType<KotlinCompile> {
+            tasks.withType(BaseKotlinCompile::class.java).configureEach {
                 dependsOn(generateAll)
             }
         }

plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/TestData.kt

@@ -1,5 +1,7 @@
 package org.jetbrains.dataframe.gradle
 
+import org.jetbrains.kotlinx.dataframe.BuildConfig
+
 object TestData {
 
     val csvSample =
@@ -15,5 +17,5 @@ object TestData {
 
     val jsonName = "test.json"
 
-    val kotlinVersion = "1.6.0"
+    val kotlinVersion = BuildConfig.KOTLIN_VERSION
 }