luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
James Roper 2024-08-26 13:07:17 +10:00 committed by Jerry Tan
parent 16f93c543a
commit 4b75c97f69
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/scala/sbt/Defaults.scala
View File

@ -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]],