Sort files when reading them from directories just in case

VirtusLab · Mar 10, 2022 · d765fb0 · d765fb0
1 parent 04828ef
commit d765fb0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/modules/build/src/main/scala/scala/build/Inputs.scala b/modules/build/src/main/scala/scala/build/Inputs.scala
@@ -128,7 +128,8 @@ final case class Inputs(
     String.format(s"%040x", calculatedSum)
   }
 
-  private def singleFilesFromDirectory(d: Inputs.Directory): Seq[Inputs.SingleFile] =
+  private def singleFilesFromDirectory(d: Inputs.Directory): Seq[Inputs.SingleFile] = {
+    import Ordering.Implicits.seqOrdering
     os.walk.stream(d.path, skip = _.last.startsWith("."))
       .filter(os.isFile(_))
       .collect {
@@ -140,6 +141,8 @@ final case class Inputs(
           Inputs.Script(d.path, p.subRelativeTo(d.path))
       }
       .toVector
+      .sortBy(_.subPath.segments)
+    }
 }
 
 object Inputs {
@@ -176,7 +179,9 @@ object Inputs {
   }
 
   sealed trait SingleFile   extends OnDisk with SingleElement
-  sealed trait SourceFile   extends SingleFile
+  sealed trait SourceFile   extends SingleFile {
+    def subPath: os.SubPath
+  }
   sealed trait Compiled     extends Element
   sealed trait AnyScalaFile extends Compiled