Skip to content

Correctly filter targets for ABI check #306

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

Merged
merged 1 commit into from
Jul 8, 2025
Merged

Correctly filter targets for ABI check #306

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
26 changes: 24 additions & 2 deletions src/functionalTest/kotlin/kotlinx/validation/test/KlibVerificationTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ internal class KlibVerificationTests : BaseKotlinGradleTest() {
}

@Test
fun `check cross compilation support`() {
fun `check cross compilation support for apiDump`() {
Assume.assumeFalse(HostManager().isEnabled(KonanTarget.MACOS_ARM64))

val runner = test {
Expand All @@ -868,7 +868,29 @@ internal class KlibVerificationTests : BaseKotlinGradleTest() {
arguments.addAll(listOf(":apiDump", "-Pkotlin.native.enableKlibsCrossCompilation=true"))
}
}

checkKlibDump(runner.build(), "/examples/classes/TopLevelDeclarations.klib.all.dump")
}

@Test
fun `check cross compilation support for apiCheck`() {
Assume.assumeFalse(HostManager().isEnabled(KonanTarget.MACOS_ARM64))

val runner = test {
settingsGradleKts {
resolve("/examples/gradle/settings/settings-name-testproject.gradle.kts")
}
buildGradleKts {
resolve("/examples/gradle/base/withNativePluginAndCrossCompilation.gradle.kts")
}
additionalBuildConfig("/examples/gradle/configuration/appleTargets/targets.gradle.kts")
addToSrcSet("/examples/classes/TopLevelDeclarations.kt")
abiFile(projectName = "testproject") {
resolve("/examples/classes/TopLevelDeclarations.klib.all.dump")
}
runner {
arguments.addAll(listOf(":apiCheck", "-Pkotlin.native.enableKlibsCrossCompilation=true"))
}
}
assertApiCheckPassed(runner.build())
}
}
10 changes: 1 addition & 9 deletions src/main/kotlin/BinaryCompatibilityValidatorPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,18 +556,10 @@ private class KlibValidationPipelineBuilder(

// Compilable targets not supported by the host compiler
private fun Project.unsupportedTargets(): Provider<Set<KlibTarget>> {
val banned = bannedTargets() // for testing only
return project.provider {
val hm = HostManager()
project.kotlinMultiplatform.targets.matching { it.emitsKlib }
.asSequence()
.filter {
if (it is KotlinNativeTarget) {
!hm.isEnabled(it.konanTarget) || it.targetName in banned
} else {
false
}
}
.filterNot { targetIsSupported(it) }
.map { it.toKlibTarget() }
.toSet()
}
Expand Down