From a7481e49d005b4f9b736ced894478122dadb274d Mon Sep 17 00:00:00 2001 From: James Roper Date: Mon, 26 Aug 2024 13:07:17 +1000 Subject: [PATCH] Include ALL sources, and resources in source jar This follows on from #7470, to include all sources, not just managed and unmanaged, in the source jar, along with all resources (previously only unmanaged resources were included). This means that if, for whatever crazy reason, someone does modify the `sources` task to include additional sources or filter out sources, rather than using the managed or unmanaged source mechanisms, their changes will still be reflected in the source jar. --- main/src/main/scala/sbt/Defaults.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index fa2c3eb7d..a471c247a 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -1768,17 +1768,17 @@ object Defaults extends BuildCommon { // drop base directories, since there are no valid mappings for these def sourceMappings: Initialize[Task[Seq[(File, String)]]] = Def.task { - val sdirs = unmanagedSourceDirectories.value ++ managedSourceDirectories.value + val sdirs = sourceDirectories.value val base = baseDirectory.value val relative = (f: File) => relativeTo(sdirs)(f).orElse(relativeTo(base)(f)).orElse(flat(f)) val exclude = Set(sdirs, base) - (unmanagedSources.value ++ managedSources.value).flatMap { + sources.value.flatMap { case s if !exclude(s) => relative(s).map(s -> _) case _ => None } } - def resourceMappings = relativeMappings(unmanagedResources, unmanagedResourceDirectories) + def resourceMappings = relativeMappings(resources, resourceDirectories) def relativeMappings( files: Taskable[Seq[File]],