Pill: Create KotlinArtifact only for variants that include BASE
This commit is contained in:
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user