From 0264fc29b8b074839b5a39f59b3ad68568a5e8c6 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Sun, 17 Dec 2023 22:29:54 +0100 Subject: [PATCH] [Gradle] Fix defaultSourceSetName usages ^KT-62527 In Progress --- .../jetbrains/kotlin/gradle/plugin/KotlinSourceSetProcessor.kt | 2 +- .../internal/CInteropCommonizerCompositeMetadataJarBundling.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSetProcessor.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSetProcessor.kt index fcf4a5d52e5..b3e435b4db2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSetProcessor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSetProcessor.kt @@ -119,7 +119,7 @@ internal abstract class KotlinSourceSetProcessor>( open class IDEClassesTask : DefaultTask() // Workaround: as per KT-26641, when there's a Kotlin compilation with a Java source set, we create another task // that has a name composed as 'Classes`, where the IDE module name is the default source set name: - val expectedClassesTaskName = "${kotlinCompilation.defaultSourceSetName}Classes" + val expectedClassesTaskName = "${kotlinCompilation.defaultSourceSet.name}Classes" project.tasks.run { val shouldCreateTask = expectedClassesTaskName !in names if (shouldCreateTask) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerCompositeMetadataJarBundling.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerCompositeMetadataJarBundling.kt index 95ca9d091d5..625b284b231 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerCompositeMetadataJarBundling.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerCompositeMetadataJarBundling.kt @@ -27,7 +27,7 @@ internal suspend fun Project.includeCommonizedCInteropMetadata(metadataKlib: Zip val outputDirectory = commonizerTask.commonizedOutputDirectory(commonizerDependencyToken) ?: return metadataKlib.from(outputDirectory) { spec -> - spec.into(cinteropMetadataDirectoryPath(compilation.defaultSourceSetName)) + spec.into(cinteropMetadataDirectoryPath(compilation.defaultSourceSet.name)) } }