Pill: Create KotlinArtifact only for variants that include BASE

This commit is contained in:
Yan Zhulanow
2020-09-03 21:38:33 +09:00
parent 6ff68311c1
commit 901bfbb3c7
@@ -102,26 +102,28 @@ class JpsCompatiblePluginTasks(private val rootProject: Project, private val pla
removeJpsAndPillRunConfigurations() removeJpsAndPillRunConfigurations()
removeAllArtifactConfigurations() removeAllArtifactConfigurations()
val artifactDependencyMapper = object : ArtifactDependencyMapper { if (variant.includes.contains(PillExtensionMirror.Variant.BASE)) {
override fun map(dependency: PDependency): List<PDependency> { val artifactDependencyMapper = object : ArtifactDependencyMapper {
val result = mutableListOf<PDependency>() override fun map(dependency: PDependency): List<PDependency> {
val result = mutableListOf<PDependency>()
for (mappedDependency in jpsProject.mapDependency(dependency, dependencyMappers)) { for (mappedDependency in jpsProject.mapDependency(dependency, dependencyMappers)) {
result += mappedDependency result += mappedDependency
if (mappedDependency is PDependency.Module) { if (mappedDependency is PDependency.Module) {
val module = jpsProject.modules.find { it.name == mappedDependency.name } val module = jpsProject.modules.find { it.name == mappedDependency.name }
if (module != null) { if (module != null) {
result += module.embeddedDependencies result += module.embeddedDependencies
}
} }
} }
return result
} }
return result
} }
}
generateKotlinPluginArtifactFile(rootProject, artifactDependencyMapper).write() generateKotlinPluginArtifactFile(rootProject, artifactDependencyMapper).write()
}
copyRunConfigurations() copyRunConfigurations()
setOptionsForDefaultJunitRunConfiguration(rootProject) setOptionsForDefaultJunitRunConfiguration(rootProject)