Skip to content

[KGP] Default classpath metadata to the common sources IC property #7638

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
Iveta Kovalenko (ywett02) wants to merge 1 commit into
base: ikvl/osip-75/property-export
Choose a base branch
from
+7 −2
Open

[KGP] Default classpath metadata to the common sources IC property #7638

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
7 changes: 6 additions & 1 deletion ...-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/CommonCodeWithPlatformSymbolsIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ abstract class CommonCodeWithPlatformSymbolsITBase(
else -> copy(enableJvmIncrementalCompilationOfCommonSources = enabled)
}

private fun BuildOptions.withoutJvmClasspathMetadata(): BuildOptions = when (platformType) {
KotlinPlatformType.jvm -> copy(jvmClasspathMetadata = false)
else -> this
}

private val platformSourceSet = "${platformType.name}Main"

@GradleTest
Expand All @@ -54,7 +59,7 @@ abstract class CommonCodeWithPlatformSymbolsITBase(
project(
"kt-62686-mpp-source-set-boundary",
gradleVersion,
buildOptions = defaultBuildOptions.withUnsafeOptimizationsForMultiplatform(true)
buildOptions = defaultBuildOptions.withUnsafeOptimizationsForMultiplatform(true).withoutJvmClasspathMetadata()
) {
buildScriptInjection(setupBuildScript)

Expand Down
2 changes: 1 addition & 1 deletion ...-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ internal class PropertiesProvider private constructor(private val project: Proje
* giving each non-leaf fragment an isolated dependency view while jvmMain keeps the full JVM classpath.
*/
val enableJvmClasspathMetadata: Provider<Boolean>
get() = booleanProvider(PropertyNames.KOTLIN_INTERNAL_JVM_CLASSPATH_METADATA).orElse(false)
get() = booleanProvider(PropertyNames.KOTLIN_INTERNAL_JVM_CLASSPATH_METADATA).orElse(enableJvmIncrementalCompilationOfCommonSources)

val enableKlibsCrossCompilation: Boolean
get() = booleanProperty(PropertyNames.KOTLIN_NATIVE_ENABLE_KLIBS_CROSSCOMPILATION) ?: true
Expand Down