Merge pull request #1286 from Kotlin/kotlin-2.2

Kotlin 2.2

Author: Jolanrensen

build.gradle.kts

@@ -22,8 +22,11 @@ plugins {
         alias(dokka)
 //        alias(kover)
         alias(ktlint)
-        alias(korro) apply false
-        alias(kodex) apply false
+
+        // TODO cannot define korro and kodex here due to leaking them kotlin-compiler-embeddable into the build classpath
+        // alias(korro) apply false
+        // alias(kodex) apply false
+
         alias(simpleGit) apply false
         alias(dependencyVersions)
         alias(buildconfig) apply false
@@ -155,6 +158,7 @@ val modulesUsingJava11 = with(projects) {
         dataframeGeo,
         examples.ideaExamples.titanic,
         tests,
+        plugins.dataframeGradlePlugin,
     )
 }.map { it.path }
 
@@ -204,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)
             }

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/groupBy.kt

@@ -115,4 +115,5 @@ public class ReducedGroupBy<T, G>(
 }
 
 @PublishedApi
-internal fun <T, G> GroupBy<T, G>.reduce(reducer: Selector<DataFrame<G>, DataRow<G>?>) = ReducedGroupBy(this, reducer)
+internal fun <T, G> GroupBy<T, G>.reduce(reducer: Selector<DataFrame<G>, DataRow<G>?>): ReducedGroupBy<T, G> =
+    ReducedGroupBy(this, reducer)

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/pivot.kt

@@ -268,7 +268,8 @@ public class ReducedPivot<T>(
 }
 
 @PublishedApi
-internal fun <T> Pivot<T>.reduce(reducer: Selector<DataFrame<T>, DataRow<T>?>) = ReducedPivot(this, reducer)
+internal fun <T> Pivot<T>.reduce(reducer: Selector<DataFrame<T>, DataRow<T>?>): ReducedPivot<T> =
+    ReducedPivot(this, reducer)
 
 @PublishedApi
 internal inline fun <T> Pivot<T>.delegate(crossinline body: PivotGroupBy<T>.() -> DataFrame<T>): DataRow<T> =

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/html.kt

@@ -533,7 +533,7 @@ public fun <T> DataFrame<T>.toHTML(
     configuration: DisplayConfiguration = DisplayConfiguration.DEFAULT,
     cellRenderer: CellRenderer = DefaultCellRenderer,
     getFooter: (DataFrame<T>) -> String? = { "DataFrame [${it.size}]" },
-) = toHtml(configuration, cellRenderer, getFooter)
+): DataFrameHtmlData = toHtml(configuration, cellRenderer, getFooter)
 
 @Deprecated(TO_STANDALONE_HTML, ReplaceWith(TO_STANDALONE_HTML_REPLACE), DeprecationLevel.ERROR)
 public fun <T> DataFrame<T>.toStandaloneHTML(

dataframe-arrow/api/dataframe-arrow.api

@@ -53,14 +53,15 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/io/ArrowWriter :
 	public abstract fun getMismatchSubscriber ()Lkotlin/jvm/functions/Function1;
 	public abstract fun getMode ()Lorg/jetbrains/kotlinx/dataframe/io/ArrowWriter$Mode;
 	public abstract fun getTargetSchema ()Lorg/apache/arrow/vector/types/pojo/Schema;
-	public abstract fun saveArrowFeatherToByteArray ()[B
-	public abstract fun saveArrowIPCToByteArray ()[B
-	public abstract fun writeArrowFeather (Ljava/io/File;)V
-	public abstract fun writeArrowFeather (Ljava/io/OutputStream;)V
-	public abstract fun writeArrowFeather (Ljava/nio/channels/WritableByteChannel;)V
-	public abstract fun writeArrowIPC (Ljava/io/File;Z)V
-	public abstract fun writeArrowIPC (Ljava/io/OutputStream;)V
-	public abstract fun writeArrowIPC (Ljava/nio/channels/WritableByteChannel;)V
+	public fun saveArrowFeatherToByteArray ()[B
+	public fun saveArrowIPCToByteArray ()[B
+	public fun writeArrowFeather (Ljava/io/File;)V
+	public fun writeArrowFeather (Ljava/io/OutputStream;)V
+	public fun writeArrowFeather (Ljava/nio/channels/WritableByteChannel;)V
+	public fun writeArrowIPC (Ljava/io/File;Z)V
+	public fun writeArrowIPC (Ljava/io/OutputStream;)V
+	public fun writeArrowIPC (Ljava/nio/channels/WritableByteChannel;)V
+	public static synthetic fun writeArrowIPC$default (Lorg/jetbrains/kotlinx/dataframe/io/ArrowWriter;Ljava/io/File;ZILjava/lang/Object;)V
 }
 
 public final class org/jetbrains/kotlinx/dataframe/io/ArrowWriter$Companion {

gradle.properties

@@ -3,6 +3,7 @@ version=1.0.0
 jupyterApiTCRepo=
 kotlin.jupyter.add.scanner=false
 org.gradle.jvmargs=-Xmx4G -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8
+
 # build.number.detection=false
 # build.number=0.8.0
 
@@ -12,6 +13,9 @@ org.gradle.jvmargs=-Xmx4G -Duser.language=en -Duser.country=US -Dfile.encoding=U
 # KSP plugin in the modules that use it.
 kotlin.dataframe.add.ksp=false
 
+# We don't support ksp2
+ksp.useKSP2=false
+
 # Enables debug mode for dataframe.
 # This can make certain tests and checks run that should not be run in production.
 # It can also be turned on from the command line with `-Pkotlin.dataframe.debug=true`

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-ksp = "2.0.20-1.0.24"
-kotlinJupyter = "0.12.0-383"
+ksp = "2.2.0-2.0.2"
+kotlinJupyter = "0.13.0-481-1"
 
 ktlint = "12.3.0"
 
 # make sure to sync both manually with :generator module
-kotlin = "2.0.20" # needs jupyter compatibility with Kotlin 2.1 to update
-kotlinpoet = "1.18.1"
+kotlin = "2.2.0" # needs jupyter compatibility with Kotlin 2.1 to update
+kotlinpoet = "2.2.0"
 
-dokka = "1.9.20"
-libsPublisher = "1.9.23-dev-45"
+dokka = "2.0.0"
+libsPublisher = "2.2.0-rc3-dev-57"
 
 # "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs,
 # dogfood Gradle / KSP plugins in tests and idea-examples modules
@@ -48,14 +48,14 @@ jsoup = "1.18.3"
 arrow = "18.1.0"
 kodex = "0.4.4"
 simpleGit = "2.2.1"
-dependencyVersions = "0.51.0"
+dependencyVersions = "0.52.0"
 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"
+buildconfig = "5.6.7"
 benchmark = "0.4.12"
 
 geotools = "32.1"
@@ -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/dataframe-gradle-plugin/build.gradle.kts

@@ -1,9 +1,11 @@
 plugins {
     `kotlin-dsl`
-    `java-gradle-plugin`
     `maven-publish`
-    alias(libs.plugins.plugin.publish)
-    alias(libs.plugins.ktlint)
+    with(libs.plugins) {
+        alias(buildconfig)
+        alias(plugin.publish)
+        alias(ktlint)
+    }
 }
 
 repositories {
@@ -14,26 +16,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)
-    implementation(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,7 +110,11 @@ val integrationTestConfiguration by configurations.creating {
     extendsFrom(configurations.testImplementation.get())
 }
 
-val integrationTestTask = task<Test>("integrationTest") {
+tasks.pluginUnderTestMetadata {
+    pluginClasspath.from(integrationTestConfiguration)
+}
+
+val integrationTestTask = tasks.register<Test>("integrationTest") {
     dependsOn(":plugins:symbol-processor:publishToMavenLocal")
     dependsOn(":dataframe-arrow:publishToMavenLocal")
     dependsOn(":dataframe-excel:publishToMavenLocal")
@@ -126,3 +140,14 @@ val integrationTestTask = task<Test>("integrationTest") {
 }
 
 tasks.check { dependsOn(integrationTestTask) }
+
+// fixing linter + buildConfig
+kotlin.sourceSets.create("buildConfigSources") {
+    kotlin.srcDir("build/generated/sources/buildConfig/main")
+}
+tasks.generateBuildConfig {
+    finalizedBy("runKtlintFormatOverBuildConfigSourcesSourceSet")
+}
+tasks.named("runKtlintCheckOverBuildConfigSourcesSourceSet") {
+    dependsOn(tasks.generateBuildConfig, "runKtlintFormatOverBuildConfigSourcesSourceSet")
+}

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
@@ -8,13 +10,12 @@ import org.gradle.api.logging.LogLevel
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.internal.logging.services.DefaultLoggingManager
 import org.gradle.kotlin.dsl.create
-import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
 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
@@ -43,10 +44,16 @@ 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 {
+                error(
+                    "Detected KSP2. This is not supported by the DataFrame Gradle/Ksp plugin. Add 'ksp.useKSP2=false' to 'gradle.properties'.",
+                )
             }
-            tasks.withType<KotlinCompile> {
+            tasks.withType(BaseKotlinCompile::class.java).configureEach {
                 dependsOn(generateAll)
             }
         }

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

@@ -16,6 +16,8 @@ fun runGradleBuild(
     buildFile.writeText(build(buildDir))
     val settingsFile = File(buildDir, "settings.gradle.kts")
     settingsFile.writeText(settingsGradle(buildDir))
+    val propertiesFile = File(buildDir, "gradle.properties")
+    propertiesFile.writeText("ksp.useKSP2=false")
     return Build(buildDir, gradleRunner(buildDir, task).build())
 }