fixup! Keep a stub of implementationMetadataConfiguration
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/KotlinSourceSetFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/KotlinSourceSetFactory.kt
index f2f82409..8407058 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/KotlinSourceSetFactory.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/KotlinSourceSetFactory.kt
@@ -7,12 +7,8 @@
import org.gradle.api.NamedDomainObjectFactory
import org.gradle.api.Project
-import org.gradle.api.attributes.Category
import org.gradle.api.attributes.Usage
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
-import org.jetbrains.kotlin.gradle.plugin.categoryByName
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
import org.jetbrains.kotlin.gradle.plugin.usageByName
import org.jetbrains.kotlin.gradle.utils.maybeCreateDependencyScope
import org.jetbrains.kotlin.gradle.utils.maybeCreateResolvable
@@ -36,14 +32,6 @@
}
private fun defineSourceSetConfigurations(project: Project, sourceSet: KotlinSourceSet) = with(project.configurations) {
- if (this is DefaultKotlinSourceSet) {
- // Drop in KT-80897
- @Suppress("DEPRECATION_ERROR")
- maybeCreateResolvable(implementationMetadataConfigurationName) {
- attributes.attribute(Usage.USAGE_ATTRIBUTE, project.usageByName(Usage.JAVA_API))
- }
- }
-
sourceSet.run {
listOfNotNull(
apiConfigurationName,
@@ -83,6 +71,11 @@
override fun setUpSourceSetDefaults(sourceSet: DefaultKotlinSourceSet) {
super.setUpSourceSetDefaults(sourceSet)
sourceSet.resources.srcDir(defaultSourceFolder(project, sourceSet.name, SOURCE_SET_TYPE_RESOURCES))
+ // Drop in KT-80897
+ @Suppress("DEPRECATION_ERROR")
+ project.configurations.maybeCreateResolvable(sourceSet.implementationMetadataConfigurationName) {
+ attributes.attribute(Usage.USAGE_ATTRIBUTE, project.usageByName(Usage.JAVA_API))
+ }
}
override fun doCreateSourceSet(name: String): DefaultKotlinSourceSet =
