[Gradle] Keep adding dependencies to implementationMetadataConfigurationName
when IntransitiveMetadataConfiguration is disabled
This commit is contained in:
committed by
Space Team
parent
c3274b61ee
commit
6f12fbe220
+4
-5
@@ -19,9 +19,8 @@ import org.jetbrains.kotlin.gradle.plugin.sources.internal
|
||||
* In this mode, every source set will receive exactly one commonized library to analyze its source code with.
|
||||
*/
|
||||
internal fun Project.addIntransitiveMetadataDependencyIfPossible(sourceSet: DefaultKotlinSourceSet, dependency: FileCollection) {
|
||||
if (project.isIntransitiveMetadataConfigurationEnabled) {
|
||||
project.dependencies.add(sourceSet.intransitiveMetadataConfigurationName, dependency)
|
||||
} /*else {
|
||||
project.dependencies.add(sourceSet.internal.resolvableMetadataConfiguration.name, dependency)
|
||||
}*/
|
||||
val dependencyConfigurationName =
|
||||
if (project.isIntransitiveMetadataConfigurationEnabled) sourceSet.intransitiveMetadataConfigurationName
|
||||
else sourceSet.implementationMetadataConfigurationName
|
||||
project.dependencies.add(dependencyConfigurationName, dependency)
|
||||
}
|
||||
|
||||
+5
-2
@@ -96,8 +96,11 @@ private fun Project.addDependencies(
|
||||
}
|
||||
}
|
||||
|
||||
if (isIdeDependency && sourceSet is DefaultKotlinSourceSet && project.isIntransitiveMetadataConfigurationEnabled) {
|
||||
dependencies.add(sourceSet.intransitiveMetadataConfigurationName, libraries)
|
||||
if (isIdeDependency && sourceSet is DefaultKotlinSourceSet) {
|
||||
val metadataConfigurationName =
|
||||
if (project.isIntransitiveMetadataConfigurationEnabled) sourceSet.intransitiveMetadataConfigurationName
|
||||
else sourceSet.implementationMetadataConfigurationName
|
||||
dependencies.add(metadataConfigurationName, libraries)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user