From 60bcd56672852c174c9277dee62def65b2cab185 Mon Sep 17 00:00:00 2001
From: translatenix <119817707+translatenix@users.noreply.github.com>
Date: Thu, 21 Mar 2024 08:50:14 -0700
Subject: [PATCH] Eliminate unnecessary use of GregorianCalendar (#344)

Switch from `java.util.GregorianCalendar` to `java.time.LocalDateTime`
---
 .../org/pkl/core/project/ProjectPackager.java     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkl-core/src/main/java/org/pkl/core/project/ProjectPackager.java b/pkl-core/src/main/java/org/pkl/core/project/ProjectPackager.java
index 16c8e6da..8f41a55f 100644
--- a/pkl-core/src/main/java/org/pkl/core/project/ProjectPackager.java
+++ b/pkl-core/src/main/java/org/pkl/core/project/ProjectPackager.java
@@ -26,9 +26,9 @@ import java.nio.file.Path;
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.time.LocalDateTime;
+import java.time.Month;
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -84,11 +84,12 @@ public class ProjectPackager {
    * Modification time value for all zip entries in a package, to ensure that archives are
    * reproducible.
    *
-   * <p>Date is 1980 February 1st CET (value taken from {@code
-   * org.gradle.api.internal.file.archive.ZipCopyAction}).
+   * <p>Date is 1980 February 1st (value taken from {@code
+   * org.gradle.api.internal.file.archive.ZipCopyAction}). Note that this date does not contain time
+   * zone information.
    */
-  private static final long ZIP_ENTRY_MTIME =
-      new GregorianCalendar(1980, Calendar.FEBRUARY, 1, 0, 0, 0).getTimeInMillis();
+  private static final LocalDateTime ZIP_ENTRY_MTIME =
+      LocalDateTime.of(1980, Month.FEBRUARY, 1, 0, 0);
 
   private final EconomicMap<PackageUri, PackageResult> packageResults = EconomicMap.create();
 
@@ -296,7 +297,7 @@ public class ProjectPackager {
       for (var file : files) {
         var relativePath = project.getProjectDir().relativize(file);
         var zipEntry = new ZipEntry(relativePath.toString());
-        zipEntry.setTime(ZIP_ENTRY_MTIME);
+        zipEntry.setTimeLocal(ZIP_ENTRY_MTIME);
         zos.putNextEntry(zipEntry);
         Files.copy(file, zos);
         zos.closeEntry();