Set canBeConsumed = false on the deprecated configurations like compile
This leads to clearer error messages in Gradle variant-aware dependency resolution failures. Gradle has deprecated those configurations since long ago, and we didn't see much use of them as variant-aware dependency resolution entities either. So this commits sets `canBeConsumed` to false on these configuratons: * compile (+ testCompile, fooCompile in MPP) * runtime (+ testRuntime, fooRuntime, ...) * compileOnly (+ testCompileOnly, fooCompileOnly, ...) This change replaces the PR #3995
This commit is contained in:
+3
@@ -272,6 +272,7 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
|
|||||||
val configurations = target.project.configurations
|
val configurations = target.project.configurations
|
||||||
|
|
||||||
val compileConfiguration = configurations.maybeCreate(compilation.deprecatedCompileConfigurationName).apply {
|
val compileConfiguration = configurations.maybeCreate(compilation.deprecatedCompileConfigurationName).apply {
|
||||||
|
isCanBeConsumed = false
|
||||||
setupAsLocalTargetSpecificConfigurationIfSupported(target)
|
setupAsLocalTargetSpecificConfigurationIfSupported(target)
|
||||||
isVisible = false
|
isVisible = false
|
||||||
isCanBeResolved = true // Needed for IDE import
|
isCanBeResolved = true // Needed for IDE import
|
||||||
@@ -295,6 +296,7 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
|
|||||||
}
|
}
|
||||||
|
|
||||||
val compileOnlyConfiguration = configurations.maybeCreate(compilation.compileOnlyConfigurationName).apply {
|
val compileOnlyConfiguration = configurations.maybeCreate(compilation.compileOnlyConfigurationName).apply {
|
||||||
|
isCanBeConsumed = false
|
||||||
setupAsLocalTargetSpecificConfigurationIfSupported(target)
|
setupAsLocalTargetSpecificConfigurationIfSupported(target)
|
||||||
isVisible = false
|
isVisible = false
|
||||||
isCanBeResolved = true // Needed for IDE import
|
isCanBeResolved = true // Needed for IDE import
|
||||||
@@ -312,6 +314,7 @@ abstract class AbstractKotlinTargetConfigurator<KotlinTargetType : KotlinTarget>
|
|||||||
|
|
||||||
if (compilation is KotlinCompilationToRunnableFiles) {
|
if (compilation is KotlinCompilationToRunnableFiles) {
|
||||||
val runtimeConfiguration = configurations.maybeCreate(compilation.deprecatedRuntimeConfigurationName).apply {
|
val runtimeConfiguration = configurations.maybeCreate(compilation.deprecatedRuntimeConfigurationName).apply {
|
||||||
|
isCanBeConsumed = false
|
||||||
setupAsLocalTargetSpecificConfigurationIfSupported(target)
|
setupAsLocalTargetSpecificConfigurationIfSupported(target)
|
||||||
extendsFrom(compileConfiguration)
|
extendsFrom(compileConfiguration)
|
||||||
isVisible = false
|
isVisible = false
|
||||||
|
|||||||
Reference in New Issue
Block a user