Skip to content

Commit 7aad8e5

Browse files
AYastrebovSpace Team
authored andcommitted
[Gradle] Workaround for not completable Future with cross compilation
^KT-81134
1 parent d061774 commit 7aad8e5

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/publishing/Publishing.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private fun createTargetPublications(project: Project, publishing: PublishingExt
9797
.withType(InternalKotlinTarget::class.java)
9898
.matching { kotlinTarget ->
9999
when (kotlinTarget) {
100-
is KotlinNativeTarget -> kotlinTarget.crossCompilationPublishable
100+
is KotlinNativeTarget -> kotlinTarget.publishableWithFallback
101101
else -> kotlinTarget.publishable
102102
}
103103
}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ abstract class KotlinNativeTarget @Inject constructor(
108108
get() = disambiguateName("binaries")
109109

110110
override val publishable: Boolean
111-
get() = crossCompilationOnCurrentHostSupported.getOrThrow()
111+
get() = publishableWithFallback
112112

113113
override val compilerOptions: KotlinNativeCompilerOptions = project.objects
114114
.newInstance<KotlinNativeCompilerOptionsDefault>()

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ internal val AbstractKotlinNativeCompilation.crossCompilationOnCurrentHostSuppor
141141
else -> project.future { true }
142142
}
143143

144-
// The same as `KotlinNativeTarget.publishable`, but with a fallback to `enabledOnCurrentHostForKlibCompilation`
144+
// KT-81134 with a fallback to `enabledOnCurrentHostForKlibCompilation`
145145
@Suppress("DEPRECATION")
146-
internal val KotlinNativeTarget.crossCompilationPublishable: Boolean
146+
internal val KotlinNativeTarget.publishableWithFallback: Boolean
147147
get() = crossCompilationOnCurrentHostSupported.lenient.getOrNull()
148148
?: konanTarget.enabledOnCurrentHostForKlibCompilation(project.kotlinPropertiesProvider)
149149

0 commit comments

Comments
 (0)