From 4b75c97f69ab681627d6b2709571412b13b06b27 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 f574ee023..c4c43299e 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -1832,11 +1832,11 @@ object Defaults extends BuildCommon { def sourceMappings: Initialize[Task[Seq[(HashedVirtualFileRef, String)]]] = Def.task { val converter = fileConverter.value - val sdirs = unmanagedSourceDirectories.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 + sources.value .flatMap { case s if !exclude(s) => relative(s).map(s -> _) case _ => None @@ -1848,7 +1848,7 @@ object Defaults extends BuildCommon { } def resourceMappings: Initialize[Task[Seq[(HashedVirtualFileRef, String)]]] = - relativeMappings(unmanagedResources, unmanagedResourceDirectories) + relativeMappings(resources, resourceDirectories) def relativeMappings( files: Taskable[Seq[File]],