diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index 563fc37cb89..99372a756c9 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/artifacts.kt @@ -74,13 +74,15 @@ fun Project.runtimeJar(task: T, body: T.() -> Unit = {}): T { fun Project.runtimeJar(taskName: String = "jar", body: Jar.() -> Unit = {}): Jar = runtimeJar(getOrCreateTask(taskName, body)) -fun Project.sourcesJar(body: Jar.() -> Unit = {}): Jar = +fun Project.sourcesJar(sourceSet: String? = "main", body: Jar.() -> Unit = {}): Jar = getOrCreateTask("sourcesJar") { duplicatesStrategy = DuplicatesStrategy.EXCLUDE classifier = "sources" try { - project.pluginManager.withPlugin("java-base") { - from(project.the().sourceSets["main"].allSource) + if (sourceSet != null) { + project.pluginManager.withPlugin("java-base") { + from(project.the().sourceSets[sourceSet].allSource) + } } } catch (e: UnknownDomainObjectException) { // skip default sources location diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 91f97d5832f..97fc0e667ca 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -198,9 +198,8 @@ val relocateCoreSources by task { tasks.getByName("jar").enabled = false -val relocatedSourcesJar by task { +val sourcesJar = sourcesJar(sourceSet = null) { dependsOn(relocateCoreSources) - classifier = "sources" from(relocatedCoreSrc) from("$core/reflection.jvm/src") } @@ -224,11 +223,10 @@ artifacts { add(mainJar.name, artifactJar) add("runtime", artifactJar) add("archives", artifactJar) - add("archives", relocatedSourcesJar) } javadocJar() dist(fromTask = result) { - from(relocatedSourcesJar) + from(sourcesJar) }