azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Fix defaultSourceSetName usages

Browse Source 
^KT-62527 In Progress
This commit is contained in:
Anton Lakotka
2023-12-17 22:29:54 +01:00
committed by Space Team
parent a824a8f86d
commit 0264fc29b8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSetProcessor.kt
+1 -1
View File
@@ -119,7 +119,7 @@ internal abstract class KotlinSourceSetProcessor<T : AbstractKotlinCompile<*>>(
open class IDEClassesTask : DefaultTask() open class IDEClassesTask : DefaultTask()
// Workaround: as per KT-26641, when there's a Kotlin compilation with a Java source set, we create another task // 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 '<IDE module name>Classes`, where the IDE module name is the default source set name: // that has a name composed as '<IDE module name>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 { project.tasks.run {
val shouldCreateTask = expectedClassesTaskName !in names val shouldCreateTask = expectedClassesTaskName !in names
if (shouldCreateTask) { if (shouldCreateTask) {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CInteropCommonizerCompositeMetadataJarBundling.kt
+1 -1
View File
@@ -27,7 +27,7 @@ internal suspend fun Project.includeCommonizedCInteropMetadata(metadataKlib: Zip
val outputDirectory = commonizerTask.commonizedOutputDirectory(commonizerDependencyToken) ?: return val outputDirectory = commonizerTask.commonizedOutputDirectory(commonizerDependencyToken) ?: return
metadataKlib.from(outputDirectory) { spec -> metadataKlib.from(outputDirectory) { spec ->
spec.into(cinteropMetadataDirectoryPath(compilation.defaultSourceSetName)) spec.into(cinteropMetadataDirectoryPath(compilation.defaultSourceSet.name))
} }
} }