Skip to content

[KT-83620] Exclude project structure metadata from inputs when projec… #5624

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
omarismail94 wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −4
Open

[KT-83620] Exclude project structure metadata from inputs when projec… #5624

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
10 changes: 6 additions & 4 deletions ...tlin/org/jetbrains/kotlin/gradle/plugin/mpp/MetadataDependencyTransformationTaskInputs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@ internal class MetadataDependencyTransformationTaskInputs(
@get:PathSensitive(PathSensitivity.RELATIVE)
@get:IgnoreEmptyDirectories
@get:NormalizeLineEndings
val projectStructureMetadataFileCollection = kotlinSourceSet
.internal
.projectStructureMetadataResolvedConfiguration()
.files
val projectStructureMetadataFileCollection: FileCollection = if (keepProjectDependencies) {
kotlinSourceSet
.internal
.projectStructureMetadataResolvedConfiguration()
.files
} else project.files()

@Suppress("unused") // Gradle input
@get:InputFiles
Expand Down
22 changes: 22 additions & 0 deletions ...org/jetbrains/kotlin/gradle/unitTests/CInteropMetadataDependencyTransformationTaskTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,26 @@ class CInteropMetadataDependencyTransformationTaskTest : MultiplatformExtensionT
// val projectFooDotBar = projectWithCinterops("foo.bar", rootProject)
// assertTasksOutputsDoesntIntersect(projectFooBar, projectFooDotBar)
}

@Test
fun `test IDE task does not depend on project structure metadata`() = project.runLifecycleAwareTest {
enableCInteropCommonization(true)
kotlin.linuxX64()
kotlin.linuxArm64()

val commonMain = kotlin.sourceSets.getByName("commonMain")
val nativeMain = kotlin.sourceSets.create("nativeMain") as DefaultKotlinSourceSet
nativeMain.dependsOn(commonMain)

kotlin.sourceSets.getByName("linuxX64Main").dependsOn(nativeMain)
kotlin.sourceSets.getByName("linuxArm64Main").dependsOn(nativeMain)

val task = locateOrRegisterCInteropMetadataDependencyTransformationTaskForIde(nativeMain)?.get()
?: fail("Expected transformation task registered for 'nativeMain'")

assertTrue(
task.inputs.projectStructureMetadataFileCollection.isEmpty,
"Expected projectStructureMetadataFileCollection to be empty for CInterop IDE task"
)
}
}