From d6a65d71e07cfa5269cbd35cbab5945c55c85c04 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 21 Aug 2024 02:43:36 -0400
Subject: [PATCH] Set dirzip to 2010 timestamp

---
 .../src/main/scala/sbt/util/ActionCache.scala | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/util-cache/src/main/scala/sbt/util/ActionCache.scala b/util-cache/src/main/scala/sbt/util/ActionCache.scala
index 1948188e5a..0509a6e042 100644
--- a/util-cache/src/main/scala/sbt/util/ActionCache.scala
+++ b/util-cache/src/main/scala/sbt/util/ActionCache.scala
@@ -107,6 +107,8 @@ object ActionCache:
     val json = Parser.parseFromFile(manifest.toFile()).get
     Converter.fromJsonUnsafe[Manifest](json)
 
+  private val default2010Timestamp: Long = 1262304000000L
+
   def packageDirectory(
       dir: VirtualFileRef,
       conv: FileConverter,
@@ -114,14 +116,17 @@ object ActionCache:
   ): VirtualFile =
     import sbt.internal.util.codec.ManifestCodec.given
     val dirPath = conv.toPath(dir)
-    val allPaths = FileTreeView.default.list(dirPath.toGlob / ** / "*")
+    val allPaths = FileTreeView.default
+      .list(dirPath.toGlob / ** / "*")
+      .filter(!_._2.isDirectory)
+      .map(_._1)
+      .sortBy(_.toString())
     // create a manifest of files and their hashes here
     def makeManifest(manifestFile: Path): Unit =
-      val vfs = (allPaths.flatMap {
-        case (p, attr) if !attr.isDirectory =>
-          Some(conv.toVirtualFile(p): HashedVirtualFileRef)
-        case _ => None
-      }).toVector
+      val vfs = (allPaths
+        .map: p =>
+          (conv.toVirtualFile(p): HashedVirtualFileRef))
+        .toVector
       val manifest = Manifest(
         version = "0.1.0",
         outputFiles = vfs,
@@ -138,7 +143,7 @@ object ActionCache:
             case p if p == dirPath => Nil
             case p if p == mPath   => (mPath.toFile() -> manifestFileName) :: Nil
             case f                 => (f.toFile() -> outputDirectory.relativize(f).toString) :: Nil
-      IO.zip((allPaths.map(_._1) ++ Seq(mPath)).flatMap(rebase), zipPath.toFile(), None)
+      IO.zip((allPaths ++ Seq(mPath)).flatMap(rebase), zipPath.toFile(), Some(default2010Timestamp))
       conv.toVirtualFile(zipPath)
 
   /**