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

[Pill] Only add the 'jvmJar' artifact for the main source set

Browse Source
This commit is contained in:
Yan Zhulanow
2023-12-02 02:39:21 +09:00
committed by Space Team
parent 4e8a5eec7f
commit 63379b2c03
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/pill/pill-importer/src/ModelParser.kt
+8 -1
View File
@@ -69,7 +69,14 @@ class ModelParser(private val variant: Variant, private val modulePrefix: String
artifacts[output.absolutePath] = listOf(path) artifacts[output.absolutePath] = listOf(path)
} }
val jarTaskNameCandidates = listOf(sourceSet.jarTaskName, "jvmJar") val jarTaskNameCandidates = buildList {
add(sourceSet.jarTaskName)
when (sourceSet.name) {
SourceSet.MAIN_SOURCE_SET_NAME -> add("jvmJar")
SourceSet.TEST_SOURCE_SET_NAME -> add("jvmJarForTests")
}
}
val jarTask = jarTaskNameCandidates.firstNotNullOfOrNull { project.tasks.findByName(it) } as? Jar ?: continue val jarTask = jarTaskNameCandidates.firstNotNullOfOrNull { project.tasks.findByName(it) } as? Jar ?: continue
val embeddedTask = findEmbeddableTask(project, sourceSet) val embeddedTask = findEmbeddableTask(project, sourceSet)