[Gradle] Remove defaultConfigurationName
^KT-55201 Verification Pending
This commit is contained in:
committed by
Space Team
parent
2251214d24
commit
67a511544c
@@ -1025,7 +1025,6 @@ public abstract interface class org/jetbrains/kotlin/gradle/plugin/KotlinTarget
|
|||||||
public abstract fun getArtifactsTaskName ()Ljava/lang/String;
|
public abstract fun getArtifactsTaskName ()Ljava/lang/String;
|
||||||
public abstract fun getCompilations ()Lorg/gradle/api/NamedDomainObjectContainer;
|
public abstract fun getCompilations ()Lorg/gradle/api/NamedDomainObjectContainer;
|
||||||
public abstract fun getComponents ()Ljava/util/Set;
|
public abstract fun getComponents ()Ljava/util/Set;
|
||||||
public abstract fun getDefaultConfigurationName ()Ljava/lang/String;
|
|
||||||
public abstract fun getDisambiguationClassifier ()Ljava/lang/String;
|
public abstract fun getDisambiguationClassifier ()Ljava/lang/String;
|
||||||
public abstract fun getName ()Ljava/lang/String;
|
public abstract fun getName ()Ljava/lang/String;
|
||||||
public abstract fun getOverrideDisambiguationClassifierOnIdeImport ()Ljava/lang/String;
|
public abstract fun getOverrideDisambiguationClassifierOnIdeImport ()Ljava/lang/String;
|
||||||
|
|||||||
-1
@@ -36,7 +36,6 @@ interface KotlinTarget : Named, HasAttributes, HasProject, HasMutableExtras {
|
|||||||
|
|
||||||
val artifactsTaskName: String
|
val artifactsTaskName: String
|
||||||
|
|
||||||
val defaultConfigurationName: String
|
|
||||||
val apiElementsConfigurationName: String
|
val apiElementsConfigurationName: String
|
||||||
val runtimeElementsConfigurationName: String
|
val runtimeElementsConfigurationName: String
|
||||||
val sourcesElementsConfigurationName: String
|
val sourcesElementsConfigurationName: String
|
||||||
|
|||||||
-3
@@ -41,9 +41,6 @@ abstract class AbstractKotlinTarget(
|
|||||||
|
|
||||||
override fun getAttributes(): AttributeContainer = attributeContainer
|
override fun getAttributes(): AttributeContainer = attributeContainer
|
||||||
|
|
||||||
override val defaultConfigurationName: String
|
|
||||||
get() = disambiguateName("default")
|
|
||||||
|
|
||||||
@Deprecated("Scheduled for removal with Kotlin 2.2")
|
@Deprecated("Scheduled for removal with Kotlin 2.2")
|
||||||
override var useDisambiguationClassifierAsSourceSetNamePrefix: Boolean = true
|
override var useDisambiguationClassifierAsSourceSetNamePrefix: Boolean = true
|
||||||
internal set
|
internal set
|
||||||
|
|||||||
-4
@@ -228,10 +228,6 @@ internal fun applyUserDefinedAttributes(target: AbstractKotlinTarget) {
|
|||||||
}.toMutableList()
|
}.toMutableList()
|
||||||
|
|
||||||
val mainCompilation = target.compilations.findByName(KotlinCompilation.MAIN_COMPILATION_NAME)
|
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
|
// Add usages of android library when its variants are grouped by flavor
|
||||||
outputConfigurationsWithCompilations += target.kotlinComponents
|
outputConfigurationsWithCompilations += target.kotlinComponents
|
||||||
|
|||||||
-3
@@ -67,9 +67,6 @@ internal class ExternalKotlinTargetImpl internal constructor(
|
|||||||
override val artifactsTaskName: String
|
override val artifactsTaskName: String
|
||||||
get() = artifactsTask.name
|
get() = artifactsTask.name
|
||||||
|
|
||||||
override val defaultConfigurationName: String
|
|
||||||
get() = defaultConfiguration.name
|
|
||||||
|
|
||||||
override val apiElementsConfigurationName: String
|
override val apiElementsConfigurationName: String
|
||||||
get() = apiElementsConfiguration.name
|
get() = apiElementsConfiguration.name
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -222,7 +222,6 @@ private fun KotlinTargetComponent.findUsageContext(configurationName: String): U
|
|||||||
@Suppress("DEPRECATION")
|
@Suppress("DEPRECATION")
|
||||||
configurationName in compilation.relatedConfigurationNames ||
|
configurationName in compilation.relatedConfigurationNames ||
|
||||||
configurationName == compilation.target.apiElementsConfigurationName ||
|
configurationName == compilation.target.apiElementsConfigurationName ||
|
||||||
configurationName == compilation.target.runtimeElementsConfigurationName ||
|
configurationName == compilation.target.runtimeElementsConfigurationName
|
||||||
configurationName == compilation.target.defaultConfigurationName
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -33,7 +33,7 @@ abstract class KotlinWithJavaTarget<KotlinOptionsType : KotlinCommonOptions, CO
|
|||||||
override var disambiguationClassifier: String? = null
|
override var disambiguationClassifier: String? = null
|
||||||
internal set
|
internal set
|
||||||
|
|
||||||
override val defaultConfigurationName: String
|
val defaultConfigurationName: String
|
||||||
get() = Dependency.DEFAULT_CONFIGURATION
|
get() = Dependency.DEFAULT_CONFIGURATION
|
||||||
|
|
||||||
override val apiElementsConfigurationName: String
|
override val apiElementsConfigurationName: String
|
||||||
|
|||||||
Reference in New Issue
Block a user