azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Remove defaultConfigurationName

Browse Source 
^KT-55201 Verification Pending
This commit is contained in:
Anton Lakotka
2023-05-16 13:35:00 +02:00
committed by Space Team
parent 2251214d24
commit 67a511544c
7 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/api/kotlin-gradle-plugin-api.api
-1
View File
@@ -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;
libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt
-1
View File
@@ -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
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/AbstractKotlinTarget.kt
-3
View File
@@ -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
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt
-4
View File
@@ -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
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/external/ExternalKotlinTargetImpl.kt
Vendored
-3
View File
@@ -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
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt
+1 -2
View File
@@ -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
}
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinWithJavaTarget.kt
+1 -1
View File
@@ -33,7 +33,7 @@ abstract class KotlinWithJavaTarget<KotlinOptionsType : KotlinCommonOptions, CO
override var disambiguationClassifier: String? = null
internal set
override val defaultConfigurationName: String
val defaultConfigurationName: String
get() = Dependency.DEFAULT_CONFIGURATION
override val apiElementsConfigurationName: String