From 9f32d916f9718ee699187cb3e7de873a843287cf Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Sun, 19 Feb 2023 19:17:27 +0100 Subject: [PATCH] [Gradle] Move publishableSources flag to InternalKotlinTarget ^KT-55881 Verification Pending --- .../kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt | 2 +- .../kotlin/gradle/plugin/mpp/InternalKotlinTarget.kt | 1 + .../gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt index 42539fd3e0c..a6444b6b7a9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt @@ -67,7 +67,7 @@ abstract class AbstractKotlinTarget( override val publishable: Boolean get() = true - internal var publishableSources: Boolean = true + override var publishableSources: Boolean = true override fun withSourcesJar(publish: Boolean) { publishableSources = publish } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinTarget.kt index 4e3c8a281cc..8bceaad25a0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/InternalKotlinTarget.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinTargetComponent import org.jetbrains.kotlin.tooling.core.HasMutableExtras internal interface InternalKotlinTarget : KotlinTarget, HasMutableExtras { + var publishableSources: Boolean val kotlinComponents: Set fun onPublicationCreated(publication: MavenPublication) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt index 1fe4c188f64..c9823baad40 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt @@ -58,9 +58,10 @@ internal class ExternalKotlinTargetImpl internal constructor( artifactsTaskLocator.locate(this) } - private var publishSources: Boolean = true + override var publishableSources: Boolean = true + override fun withSourcesJar(publish: Boolean) { - publishSources = publish + publishableSources = publish } override val artifactsTaskName: String