From ef1e4662f1773fb3c2cca355a26f8b4ead9e6c55 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Thu, 12 Jan 2023 16:20:34 +0100 Subject: [PATCH] [Gradle] Remove unnecessary sourcesElementsPublishedConfiguration from external target API --- .../kotlin/gradle/android/AndroidTargetPrototype.kt | 6 ------ .../mpp/external/ExternalKotlinTargetDescriptor.kt | 6 ------ .../plugin/mpp/external/ExternalKotlinTargetImpl.kt | 1 - .../mpp/external/createExternalKotlinTarget.kt | 12 ++---------- 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidTargetPrototype.kt b/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidTargetPrototype.kt index c2a0c29584d..2a794baf390 100644 --- a/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidTargetPrototype.kt +++ b/libraries/tools/kotlin-gradle-plugin-tcs-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidTargetPrototype.kt @@ -93,12 +93,6 @@ fun KotlinMultiplatformExtension.androidTargetPrototype(): PrototypeAndroidTarge configuration.attributes.attribute(TARGET_JVM_ENVIRONMENT_ATTRIBUTE, project.objects.named(TargetJvmEnvironment.ANDROID)) } - sourcesElementsPublished.configure { _, configuration -> - /* TODO w/ Google: Find a way to deprecate this attribute */ - configuration.attributes.attribute(KotlinPlatformType.attribute, KotlinPlatformType.androidJvm) - configuration.attributes.attribute(TARGET_JVM_ENVIRONMENT_ATTRIBUTE, project.objects.named(TargetJvmEnvironment.ANDROID)) - } - configureIdeImport { registerDependencyResolver( AndroidBootClasspathIdeDependencyResolver(project), diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor.kt index 775aa8b01c2..6b48e0bb40d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetDescriptor.kt @@ -27,7 +27,6 @@ interface ExternalKotlinTargetDescriptor { val sourcesElements: ExternalKotlinTargetConfigurationDescriptor val apiElementsPublished: ExternalKotlinTargetConfigurationDescriptor val runtimeElementsPublished: ExternalKotlinTargetConfigurationDescriptor - val sourcesElementsPublished: ExternalKotlinTargetConfigurationDescriptor val configure: ((T) -> Unit)? val configureIdeImport: (IdeMultiplatformImport.() -> Unit)? @@ -61,9 +60,6 @@ class ExternalKotlinTargetDescriptorBuilder i val runtimeElementsPublished: ExternalKotlinTargetConfigurationDescriptorBuilder = ExternalKotlinTargetConfigurationDescriptorBuilder() - val sourcesElementsPublished: ExternalKotlinTargetConfigurationDescriptorBuilder = - ExternalKotlinTargetConfigurationDescriptorBuilder() - var configure: ((T) -> Unit)? = null fun configure(action: (T) -> Unit) { @@ -89,7 +85,6 @@ class ExternalKotlinTargetDescriptorBuilder i sourcesElements = sourcesElements.build(), apiElementsPublished = apiElementsPublished.build(), runtimeElementsPublished = runtimeElementsPublished.build(), - sourcesElementsPublished = sourcesElementsPublished.build(), configure = configure, configureIdeImport = configureIdeImport ) @@ -104,7 +99,6 @@ private data class ExternalKotlinTargetDescriptorImpl, override val apiElementsPublished: ExternalKotlinTargetConfigurationDescriptor, override val runtimeElementsPublished: ExternalKotlinTargetConfigurationDescriptor, - override val sourcesElementsPublished: ExternalKotlinTargetConfigurationDescriptor, override val configure: ((T) -> Unit)?, override val configureIdeImport: (IdeMultiplatformImport.() -> Unit)?, ) : ExternalKotlinTargetDescriptor 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 b6117d17826..7668410c653 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 @@ -31,7 +31,6 @@ internal class ExternalKotlinTargetImpl internal constructor( val sourcesElementsConfiguration: Configuration, val apiElementsPublishedConfiguration: Configuration, val runtimeElementsPublishedConfiguration: Configuration, - val sourcesElementsPublishedConfiguration: Configuration, val kotlinTargetComponent: ExternalKotlinTargetComponent, private val artifactsTaskLocator: ArtifactsTaskLocator, ) : InternalKotlinTarget { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/createExternalKotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/createExternalKotlinTarget.kt index 69850b8c37c..e435081852e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/createExternalKotlinTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/createExternalKotlinTarget.kt @@ -16,10 +16,10 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages import org.jetbrains.kotlin.gradle.plugin.mpp.configureSourcesPublicationAttributes -import org.jetbrains.kotlin.gradle.utils.markConsumable import org.jetbrains.kotlin.gradle.plugin.usesPlatformOf import org.jetbrains.kotlin.gradle.tasks.locateOrRegisterTask import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName +import org.jetbrains.kotlin.gradle.utils.markConsumable import org.jetbrains.kotlin.gradle.utils.named @ExternalKotlinTargetApi @@ -37,9 +37,6 @@ fun KotlinMultiplatformExtension.createExter val runtimeElementsPublishedConfiguration = project.configurations.maybeCreate(lowerCamelCaseName(descriptor.targetName, "runtimeElements-published")) - val sourcesElementsPublishedConfiguration = - project.configurations.maybeCreate(lowerCamelCaseName(descriptor.targetName, "sourcesElements-published")) - val kotlinTargetComponent = ExternalKotlinTargetComponent( ExternalKotlinTargetComponent.TargetProvider.byTargetName(this, descriptor.targetName) ) @@ -59,7 +56,6 @@ fun KotlinMultiplatformExtension.createExter sourcesElementsConfiguration = sourcesElementsConfiguration, apiElementsPublishedConfiguration = apiElementsPublishedConfiguration, runtimeElementsPublishedConfiguration = runtimeElementsPublishedConfiguration, - sourcesElementsPublishedConfiguration = sourcesElementsPublishedConfiguration, kotlinTargetComponent = kotlinTargetComponent, artifactsTaskLocator = artifactsTaskLocator ) @@ -69,18 +65,15 @@ fun KotlinMultiplatformExtension.createExter target.setupRuntimeElements(runtimeElementsConfiguration) target.setupRuntimeElements(runtimeElementsPublishedConfiguration) target.setupSourcesElements(sourcesElementsConfiguration) - target.setupSourcesElements(sourcesElementsPublishedConfiguration) apiElementsConfiguration.markConsumable() runtimeElementsConfiguration.markConsumable() sourcesElementsConfiguration.markConsumable() - /* Those configurations can not be resolved but also not consumed (not suitable for project to proejct dependencies */ + /* Those configurations can not be resolved but also not consumed (not suitable for project to project dependencies) */ apiElementsPublishedConfiguration.isCanBeConsumed = false apiElementsPublishedConfiguration.isCanBeResolved = false runtimeElementsPublishedConfiguration.isCanBeResolved = false runtimeElementsPublishedConfiguration.isCanBeConsumed = false - sourcesElementsPublishedConfiguration.isCanBeResolved = false - sourcesElementsPublishedConfiguration.isCanBeConsumed = false val decorated = descriptor.targetFactory.create(DecoratedExternalKotlinTarget.Delegate(target)) target.onCreated() @@ -91,7 +84,6 @@ fun KotlinMultiplatformExtension.createExter descriptor.sourcesElements.configure?.invoke(decorated, sourcesElementsConfiguration) descriptor.apiElementsPublished.configure?.invoke(decorated, apiElementsPublishedConfiguration) descriptor.runtimeElementsPublished.configure?.invoke(decorated, runtimeElementsPublishedConfiguration) - descriptor.sourcesElementsPublished.configure?.invoke(decorated, sourcesElementsPublishedConfiguration) descriptor.configureIdeImport?.invoke(project.kotlinIdeMultiplatformImport) targets.add(decorated)