Skip to content

Commit cab218c

Browse files
authored
Merge pull request #881 from mgroth0/custom-configs
Find KSP Configurations that are Added Later
2 parents d50f021 + ac8f23c commit cab218c

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

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

+12-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package org.jetbrains.dataframe.gradle
33
import com.google.devtools.ksp.gradle.KspExtension
44
import org.gradle.api.Plugin
55
import org.gradle.api.Project
6-
import org.gradle.api.artifacts.UnknownConfigurationException
76
import org.gradle.kotlin.dsl.getByType
87
import java.util.Properties
98

@@ -67,19 +66,27 @@ class ConvenienceSchemaGeneratorPlugin : Plugin<Project> {
6766
isMultiplatform -> listOf("kspJvm", "kspJvmTest")
6867
else -> listOf("ksp", "kspTest")
6968
}
69+
70+
val cfgsToAdd = configs.toMutableSet()
71+
7072
configs.forEach { cfg ->
71-
try {
72-
target.configurations.getByName(cfg).dependencies.add(
73+
target.configurations.named { it == cfg }.configureEach {
74+
cfgsToAdd.remove(cfg)
75+
dependencies.add(
7376
target.dependencies.create(
7477
"org.jetbrains.kotlinx.dataframe:symbol-processor-all:$preprocessorVersion",
7578
),
7679
)
77-
} catch (e: UnknownConfigurationException) {
80+
}
81+
}
82+
target.gradle.projectsEvaluated {
83+
cfgsToAdd.forEach { cfg ->
7884
target.logger.warn(
79-
"Configuration '$cfg' not found. Please make sure the KSP plugin is applied.",
85+
"Configuration '$cfg' was never found. Please make sure the KSP plugin is applied.",
8086
)
8187
}
8288
}
89+
8390
target.logger.info("Added DataFrame dependency to the KSP plugin.")
8491
target.extensions.getByType<KspExtension>().arg(
8592
"dataframe.resolutionDir",

0 commit comments

Comments
 (0)