Skip to content

Check for klib cross compilation support from the KotlinNativeCompilation #2738

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
eygraber wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Check for klib cross compilation support from the KotlinNativeCompilation #2738

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dd689d
Check for klib cross compilation support from the KotlinNativeCompila…
eygraber Dec 21, 2025
4431b3a
Add a KGP version check around crossCompilationSupported
eygraber Dec 25, 2025
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
33 changes: 30 additions & 3 deletions gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspAATask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import com.google.devtools.ksp.processing.KSPNativeConfig
import com.google.devtools.ksp.processing.KspGradleLogger
import org.gradle.api.DefaultTask
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration
import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.file.DirectoryProperty
Expand Down Expand Up @@ -66,12 +67,14 @@ import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmAndroidCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeCompilation
import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompileTool
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.tooling.core.KotlinToolingVersion
import java.io.ByteArrayOutputStream
import java.io.File
import java.io.ObjectOutputStream
Expand Down Expand Up @@ -382,9 +385,10 @@ abstract class KspAATask @Inject constructor(
cfg.konanTargetName.value(konanTargetName)
cfg.konanHome.value((kotlinCompileProvider.get() as KotlinNativeCompile).konanHome)

val isKlibCrossCompilationEnabled: Provider<Boolean> = project.providers.gradleProperty(
"kotlin.native.enableKlibsCrossCompilation"
).orElse("false").map { it.toBoolean() }
val isKlibCrossCompilationEnabled = getKlibCrossCompilationSupport(
project,
kotlinCompilation
)
kspAATask.onlyIf {
isKlibCrossCompilationEnabled.get() || HostManager().enabled.any {
it.name == konanTargetName
Expand All @@ -404,6 +408,29 @@ abstract class KspAATask @Inject constructor(

return kspTaskProvider
}

/**
* Returns a Provider<Boolean> indicating whether klib cross-compilation is enabled.
* For Kotlin 2.3.20-Beta2+, uses KotlinNativeCompilation.crossCompilationSupported.
* For earlier versions, falls back to checking the gradle property kotlin.native.enableKlibsCrossCompilation.
*/
private fun getKlibCrossCompilationSupport(
project: Project,
kotlinCompilation: KotlinNativeCompilation
): Provider<Boolean> {
val kotlinVersion = project.getKotlinPluginVersion()
val isSupportCrossCompilationPropertyAvailable =
KotlinToolingVersion(kotlinVersion) >= KotlinToolingVersion("2.3.20-Beta2")

return if (isSupportCrossCompilationPropertyAvailable) {
kotlinCompilation.crossCompilationSupported
} else {
// Fallback for Kotlin versions before 2.3.20-Beta2
project.providers.gradleProperty(
"kotlin.native.enableKlibsCrossCompilation"
).orElse("false").map { it.toBoolean() }
}
}
}
}

Expand Down
Loading