[Gradle] Keep adding dependencies to implementationMetadataConfigurationName

when IntransitiveMetadataConfiguration is disabled
This commit is contained in:
Anton Lakotka
2023-01-10 15:27:18 +01:00
committed by Space Team
parent c3274b61ee
commit 6f12fbe220
2 changed files with 9 additions and 7 deletions
@@ -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. * 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) { internal fun Project.addIntransitiveMetadataDependencyIfPossible(sourceSet: DefaultKotlinSourceSet, dependency: FileCollection) {
if (project.isIntransitiveMetadataConfigurationEnabled) { val dependencyConfigurationName =
project.dependencies.add(sourceSet.intransitiveMetadataConfigurationName, dependency) if (project.isIntransitiveMetadataConfigurationEnabled) sourceSet.intransitiveMetadataConfigurationName
} /*else { else sourceSet.implementationMetadataConfigurationName
project.dependencies.add(sourceSet.internal.resolvableMetadataConfiguration.name, dependency) project.dependencies.add(dependencyConfigurationName, dependency)
}*/
} }
@@ -96,8 +96,11 @@ private fun Project.addDependencies(
} }
} }
if (isIdeDependency && sourceSet is DefaultKotlinSourceSet && project.isIntransitiveMetadataConfigurationEnabled) { if (isIdeDependency && sourceSet is DefaultKotlinSourceSet) {
dependencies.add(sourceSet.intransitiveMetadataConfigurationName, libraries) val metadataConfigurationName =
if (project.isIntransitiveMetadataConfigurationEnabled) sourceSet.intransitiveMetadataConfigurationName
else sourceSet.implementationMetadataConfigurationName
dependencies.add(metadataConfigurationName, libraries)
} }
} }