From 63379b2c0304d75b0e23d981b76f05e0914fad87 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Sat, 2 Dec 2023 02:39:21 +0900 Subject: [PATCH] [Pill] Only add the 'jvmJar' artifact for the main source set --- plugins/pill/pill-importer/src/ModelParser.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/pill/pill-importer/src/ModelParser.kt b/plugins/pill/pill-importer/src/ModelParser.kt index c8637da0388..b7323cb5025 100644 --- a/plugins/pill/pill-importer/src/ModelParser.kt +++ b/plugins/pill/pill-importer/src/ModelParser.kt @@ -69,7 +69,14 @@ class ModelParser(private val variant: Variant, private val modulePrefix: String 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 embeddedTask = findEmbeddableTask(project, sourceSet)