Merge pull request #571 from Kotlin/update-ksp-1921

Add option to prevent Gradle plugin from adding dependency on KSP
Kotlin · Jan 26, 2024 · d3b278f · d3b278f
2 parents 40776fb + e15cb54
commit d3b278f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-ksp = "1.9.0-1.0.12"
+ksp = "1.9.21-1.0.15"
 kotlinJupyter = "0.11.0-358"
 ktlint = "3.4.5"
 kotlin = "1.9.0"

diff --git a/...plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/ConvenienceSchemaGeneratorPlugin.kt b/...plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/ConvenienceSchemaGeneratorPlugin.kt
@@ -3,13 +3,29 @@ 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.getByType
+import org.gradle.kotlin.dsl.findByType
 import java.util.*
 
 @Suppress("unused")
 class ConvenienceSchemaGeneratorPlugin : Plugin<Project> {
     override fun apply(target: Project) {
-        target.plugins.apply(KspPluginApplier::class.java)
+        val name = "kotlin.dataframe.add.ksp"
+        val property = target.findProperty(name)?.toString()
+        var addKsp = true
+
+        if (property != null) {
+            if (property.equals("true", ignoreCase = true) || property.equals("false", ignoreCase = true)) {
+                addKsp = property.toBoolean()
+            } else {
+                target.logger.warn("Invalid value '$property' for '$name' property. Defaulting to '$addKsp'. Please use 'true' or 'false'.")
+            }
+        }
+        if (addKsp) {
+            target.plugins.apply(KspPluginApplier::class.java)
+        }
+        target.afterEvaluate {
+            target.extensions.findByType<KspExtension>()?.arg("dataframe.resolutionDir", target.projectDir.absolutePath)
+        }
         target.plugins.apply(SchemaGeneratorPlugin::class.java)
     }
 }
@@ -31,6 +47,5 @@ internal class KspPluginApplier : Plugin<Project> {
         target.configurations.getByName("ksp").dependencies.add(
             target.dependencies.create("org.jetbrains.kotlinx.dataframe:symbol-processor-all:$preprocessorVersion")
         )
-        target.extensions.getByType<KspExtension>().arg("dataframe.resolutionDir", target.projectDir.absolutePath)
     }
 }
diff --git a/...e-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/toCamelCaseByDelimiters.kt b/...e-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/toCamelCaseByDelimiters.kt
@@ -1,9 +1,11 @@
 package org.jetbrains.dataframe.gradle
 
+import java.util.Locale
+
 fun String.toCamelCaseByDelimiters(delimiters: Regex): String {
-    return split(delimiters).joinToCamelCaseString().decapitalize()
+    return split(delimiters).joinToCamelCaseString().replaceFirstChar { it.lowercase(Locale.getDefault()) }
 }
 
 fun List<String>.joinToCamelCaseString(): String {
-    return joinToString(separator = "") { it.capitalize() }
+    return joinToString(separator = "") { s -> s.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() } }
 }
diff --git a/plugins/symbol-processor/src/main/kotlin/org/jetbrains/dataframe/ksp/DataSchemaGenerator.kt b/plugins/symbol-processor/src/main/kotlin/org/jetbrains/dataframe/ksp/DataSchemaGenerator.kt
@@ -48,9 +48,7 @@ class DataSchemaGenerator(
     private val codeGenerator: com.google.devtools.ksp.processing.CodeGenerator,
 ) {
 
-    fun resolveImportStatements() = listOf(
-        ::resolvePathImports,
-    ).flatMap { it(resolver) }
+    fun resolveImportStatements(): List<ImportDataSchemaStatement> = resolvePathImports(resolver).toList()
 
     class ImportDataSchemaStatement(
         val origin: KSFile,