azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pill: Create KotlinArtifact only for variants that include BASE

Browse Source
This commit is contained in:
Yan Zhulanow
2020-09-03 21:38:33 +09:00
parent 6ff68311c1
commit 901bfbb3c7
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
+15 -13
View File
@@ -102,26 +102,28 @@ class JpsCompatiblePluginTasks(private val rootProject: Project, private val pla
removeJpsAndPillRunConfigurations()
removeAllArtifactConfigurations()
val artifactDependencyMapper = object : ArtifactDependencyMapper {
override fun map(dependency: PDependency): List<PDependency> {
val result = mutableListOf<PDependency>()
if (variant.includes.contains(PillExtensionMirror.Variant.BASE)) {
val artifactDependencyMapper = object : ArtifactDependencyMapper {
override fun map(dependency: PDependency): List<PDependency> {
val result = mutableListOf<PDependency>()
for (mappedDependency in jpsProject.mapDependency(dependency, dependencyMappers)) {
result += mappedDependency
for (mappedDependency in jpsProject.mapDependency(dependency, dependencyMappers)) {
result += mappedDependency
if (mappedDependency is PDependency.Module) {
val module = jpsProject.modules.find { it.name == mappedDependency.name }
if (module != null) {
result += module.embeddedDependencies
if (mappedDependency is PDependency.Module) {
val module = jpsProject.modules.find { it.name == mappedDependency.name }
if (module != null) {
result += module.embeddedDependencies
}
}
}
return result
}
return result
}
}
generateKotlinPluginArtifactFile(rootProject, artifactDependencyMapper).write()
generateKotlinPluginArtifactFile(rootProject, artifactDependencyMapper).write()
}
copyRunConfigurations()
setOptionsForDefaultJunitRunConfiguration(rootProject)