Skip to content

[Gradle] Delete KotlinSourceSet.implementationMetadataConfigurationName #7605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Egor Andreevich (Egorand) wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Gradle] Delete KotlinSourceSet.implementationMetadataConfigurationName #7605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinSourceS
public abstract fun getCustomSourceFilesExtensions ()Ljava/lang/Iterable;
public abstract fun getDependsOn ()Ljava/util/Set;
public abstract fun getGeneratedKotlin ()Lorg/gradle/api/file/SourceDirectorySet;
public abstract synthetic fun getImplementationMetadataConfigurationName ()Ljava/lang/String;
public abstract fun getKotlin ()Lorg/gradle/api/file/SourceDirectorySet;
public abstract fun getLanguageSettings ()Lorg/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder;
public abstract fun getResources ()Lorg/gradle/api/file/SourceDirectorySet;
Expand Down
6 changes: 0 additions & 6 deletions ...gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,6 @@ interface KotlinSourceSet : Named, HasProject, HasMutableExtras, HasKotlinDepend
*/
fun addCustomSourceFilesExtensions(extensions: List<String>) {}

/**
* @suppress
*/
@Deprecated(message = "KT-80897. Keep ABI compatibility with kotlinx-benchmarks", level = DeprecationLevel.HIDDEN)

@Egorand Egor Andreevich (Egorand) Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kotlinx-benchmark does not reference this API anymore (commit that removed the callsite) since 0.4.15 (latest version is 0.4.17).

@timofeys1 Timofey Solonin (timofeys1) Aug 20, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you might still not be able to remove it because coroutines seems to still use 0.4.13

@timofeys1 Timofey Solonin (timofeys1) Aug 20, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that's the case, you will need to bump the version in coroutines and then whether we can remove this depend on where exactly the benchmarks were used

@Egorand Egor Andreevich (Egorand) Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, yeah, we had a similar issue with kotlinx.collections.immutable: https://jetbrains.slack.com/archives/C06QB5UHN9Y/p1787063796944369?thread_ts=1787058758.326779&cid=C06QB5UHN9Y. Let me try to bump the version in coroutines and see if it builds with the latest benchmarks.

@Egorand Egor Andreevich (Egorand) Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stopped safe-merge job for now while I investigate.

@Egorand Egor Andreevich (Egorand) Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kotlin/kotlinx.coroutines#4732

val implementationMetadataConfigurationName: String

/**
* Represents a set of generated Kotlin source files that are included in this [KotlinSourceSet].
*
Expand Down
1 change: 0 additions & 1 deletion libraries/tools/kotlin-gradle-plugin/api/all/kotlin-gradle-plugin.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1971,7 +1971,6 @@ public abstract class org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSo
public fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/MutableExtras;
public fun getGeneratedKotlin ()Lorg/gradle/api/file/SourceDirectorySet;
public fun getImplementationConfigurationName ()Ljava/lang/String;
public fun getImplementationMetadataConfigurationName ()Ljava/lang/String;
public fun getKotlin ()Lorg/gradle/api/file/SourceDirectorySet;
public fun getLanguageSettings ()Lorg/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder;
public fun getName ()Ljava/lang/String;
Expand Down
6 changes: 1 addition & 5 deletions ...in/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/DefaultKotlinSourceSet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ abstract class DefaultKotlinSourceSet @Inject constructor(

fun getAdditionalVisibleSourceSets(): List<KotlinSourceSet> = getVisibleSourceSetsFromAssociateCompilations(this)

@Deprecated("KT-80897. Keep ABI compatibility with kotlinx-benchmarks", level = DeprecationLevel.ERROR)
override val implementationMetadataConfigurationName: String
get() = lowerCamelCaseName(implementationConfigurationName, METADATA_CONFIGURATION_NAME_SUFFIX)

@ExperimentalKotlinGradlePluginApi
override val generatedKotlin: SourceDirectorySet = project.objects
.kotlinSourceDirectorySet(name, "generatedKotlin", "generated sources")
Expand Down Expand Up @@ -160,4 +156,4 @@ fun KotlinMultiplatformExtension.findSourceSetsDependingOn(sourceSet: KotlinSour
internal val KotlinSourceSet.defaultImpl: DefaultKotlinSourceSet
get() = (this as? DefaultKotlinSourceSet) ?: throw IllegalArgumentException(
"KotlinSourceSet $name (${this::class}) does not implement ${DefaultKotlinSourceSet::class.simpleName}"
)
)
5 changes: 0 additions & 5 deletions ...in/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/KotlinSourceSetFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,6 @@ internal class DefaultKotlinSourceSetFactory(
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 =
Expand Down