From 9f1d2fd4ed3ce95e7d0375f66eb6e17eac8aa954 Mon Sep 17 00:00:00 2001 From: MINKYU LEE Date: Mon, 9 Oct 2023 11:56:48 +0900 Subject: [PATCH] Fix bug of unmanagedResourceDirectories (#7178) Sort resourceDirectories for copyResourcesTask --- main/src/main/scala/sbt/Defaults.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 8a8728892..bf30d5f71 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -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