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

Merge pull request #7630 from jroper/package-src 

Include ALL sources, and resources in source jar
This commit is contained in:
eugene yokota 2024-08-26 12:35:44 -04:00 committed by GitHub
parent 2f936295f1 a7481e49d0
commit ee7a9aecc5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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

@ -1768,17 +1768,17 @@ object Defaults extends BuildCommon {
// drop base directories, since there are no valid mappings for these // drop base directories, since there are no valid mappings for these
def sourceMappings: Initialize[Task[Seq[(File, String)]]] = def sourceMappings: Initialize[Task[Seq[(File, String)]]] =
Def.task { Def.task {
val sdirs = unmanagedSourceDirectories.value ++ managedSourceDirectories.value val sdirs = sourceDirectories.value
val base = baseDirectory.value val base = baseDirectory.value
val relative = (f: File) => relativeTo(sdirs)(f).orElse(relativeTo(base)(f)).orElse(flat(f)) val relative = (f: File) => relativeTo(sdirs)(f).orElse(relativeTo(base)(f)).orElse(flat(f))
val exclude = Set(sdirs, base) val exclude = Set(sdirs, base)
(unmanagedSources.value ++ managedSources.value).flatMap { sources.value.flatMap {
case s if !exclude(s) => relative(s).map(s -> _) case s if !exclude(s) => relative(s).map(s -> _)
case _ => None case _ => None
} }
} }
def resourceMappings = relativeMappings(unmanagedResources, unmanagedResourceDirectories) def resourceMappings = relativeMappings(resources, resourceDirectories)
def relativeMappings( def relativeMappings(
files: Taskable[Seq[File]], files: Taskable[Seq[File]],