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

Fix bug of unmanagedResourceDirectories (#7178) 

Sort resourceDirectories for copyResourcesTask
This commit is contained in:
MINKYU LEE 2023-10-09 11:56:48 +09:00 committed by GitHub
parent c48c1f66de
commit 9f1d2fd4ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2542,7 +2542,8 @@ object Defaults extends BuildCommon {
val cacheStore = factory.make("copy-resource")
val converter = fileConverter.value
val flt: File => Option[File] = flat(t)
val transform: File => Option[File] = (f: File) => rebase(dirs, t)(f).orElse(flt(f))
val transform: File => Option[File] =
(f: File) => rebase(resourceDirectories.value.sorted, t)(f).orElse(flt(f))
val mappings: Seq[(File, File)] = resources.value.flatMap {
case r if !dirs(r) => transform(r).map(r -> _)
case _ => None