From 67a511544cd0fdd11f6a92fbd842c834b55601d8 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Tue, 16 May 2023 13:35:00 +0200 Subject: [PATCH] [Gradle] Remove defaultConfigurationName ^KT-55201 Verification Pending --- .../kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api | 1 - .../kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt | 1 - .../kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt | 3 --- .../kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt | 4 ---- .../gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt | 3 --- .../kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt | 3 +-- .../kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt | 2 +- 7 files changed, 2 insertions(+), 15 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api index 399786878a9..f2aec4af1a6 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api +++ b/libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api @@ -1025,7 +1025,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinTarget public abstract fun getArtifactsTaskName ()Ljava/lang/String; public abstract fun getCompilations ()Lorg/gradle/api/NamedDomainObjectContainer; public abstract fun getComponents ()Ljava/util/Set; - public abstract fun getDefaultConfigurationName ()Ljava/lang/String; public abstract fun getDisambiguationClassifier ()Ljava/lang/String; public abstract fun getName ()Ljava/lang/String; public abstract fun getOverrideDisambiguationClassifierOnIdeImport ()Ljava/lang/String; diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt index 47a0c2acd28..38c54e63db0 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt @@ -36,7 +36,6 @@ interface KotlinTarget : Named, HasAttributes, HasProject, HasMutableExtras { val artifactsTaskName: String - val defaultConfigurationName: String val apiElementsConfigurationName: String val runtimeElementsConfigurationName: String val sourcesElementsConfigurationName: String 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 98bb041d3ec..3e1ced53b90 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 @@ -41,9 +41,6 @@ abstract class AbstractKotlinTarget( override fun getAttributes(): AttributeContainer = attributeContainer - override val defaultConfigurationName: String - get() = disambiguateName("default") - @Deprecated("Scheduled for removal with Kotlin 2.2") override var useDisambiguationClassifierAsSourceSetNamePrefix: Boolean = true internal set diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt index 79581b100d2..52fe10add7b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt @@ -228,10 +228,6 @@ internal fun applyUserDefinedAttributes(target: AbstractKotlinTarget) { }.toMutableList() val mainCompilation = target.compilations.findByName(KotlinCompilation.MAIN_COMPILATION_NAME) - val defaultTargetConfiguration = project.configurations.findByName(target.defaultConfigurationName) - if (mainCompilation != null && defaultTargetConfiguration != null) { - outputConfigurationsWithCompilations += defaultTargetConfiguration to mainCompilation - } // Add usages of android library when its variants are grouped by flavor outputConfigurationsWithCompilations += target.kotlinComponents 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 c5ef86bdf5a..d9e5ce5ddd5 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 @@ -67,9 +67,6 @@ internal class ExternalKotlinTargetImpl internal constructor( override val artifactsTaskName: String get() = artifactsTask.name - override val defaultConfigurationName: String - get() = defaultConfiguration.name - override val apiElementsConfigurationName: String get() = apiElementsConfiguration.name diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt index 7e12f18aa83..98acd449318 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt @@ -222,7 +222,6 @@ private fun KotlinTargetComponent.findUsageContext(configurationName: String): U @Suppress("DEPRECATION") configurationName in compilation.relatedConfigurationNames || configurationName == compilation.target.apiElementsConfigurationName || - configurationName == compilation.target.runtimeElementsConfigurationName || - configurationName == compilation.target.defaultConfigurationName + configurationName == compilation.target.runtimeElementsConfigurationName } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt index 26fa706e6b4..f6f7d2d737f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt @@ -33,7 +33,7 @@ abstract class KotlinWithJavaTarget