Merge BRANCH_3.3

Author: dbarashev

.github/workflows/build-packages.yml

@@ -5,8 +5,8 @@ on:
         branches: ['master', 'BRANCH*']
         paths: ['ganttproject-builder/BUILD-HISTORY-MAJOR']
 env:
-    BUILD_NUMBER: 3313
-    VERSION: 3.3.3313
+    BUILD_NUMBER: 3316
+    VERSION: 3.3.3316
     WINDOWS_APP_FOLDER_NAME: GanttProject-3.3
     MAC_APP_NAME: GanttProject 3.3
     MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
@@ -29,7 +29,7 @@ jobs:
             - uses: actions/setup-java@v3
               with:
                   distribution: 'liberica'
-                  java-version: 17.0.13
+                  java-version: 17.0.14
                   java-package: jdk+fx
                   cache: 'gradle'
             - name: Build GanttProject
@@ -73,7 +73,7 @@ jobs:
             - uses: actions/setup-java@v3
               with:
                   distribution: 'liberica'
-                  java-version: 17.0.13
+                  java-version: 17.0.14
                   java-package: jdk+fx
                   cache: 'gradle'
             - name: Build GanttProject
@@ -144,7 +144,7 @@ jobs:
             - uses: actions/setup-java@v3
               with:
                   distribution: 'liberica'
-                  java-version: 17.0.13
+                  java-version: 17.0.14
                   java-package: jdk+fx
                   cache: 'gradle'
             - name: Build GanttProject
@@ -192,7 +192,7 @@ jobs:
             - uses: actions/setup-java@v3
               with:
                   distribution: 'liberica'
-                  java-version: 17.0.13
+                  java-version: 17.0.14
                   java-package: jdk+fx
                   cache: 'gradle'
             - name: Build GanttProject

biz.ganttproject.impex.msproject2/src/main/java/biz/ganttproject/impex/msproject2/ProjectFileImporterImpl.kt

@@ -539,10 +539,16 @@ class ProjectFileImporterImpl(private val myProjectFile: ProjectFile, private va
       if (t.milestone) {
         return@Function Pair.create<TimeDuration, TimeDuration>(getTaskManager().createLength(1), null)
       }
-      getDurations(
-        ProjectFileImporter.toJavaDate(t.start.toLocalDate()),
-        myNativeProject.timeUnitStack.defaultTimeUnit.adjustRight(ProjectFileImporter.toJavaDate(t.finish.toLocalDate()))
-      )
+      val defaultTimeUnit = myNativeProject.timeUnitStack.defaultTimeUnit
+      var finishDate = ProjectFileImporter.toJavaDate(t.finish.toLocalDate())
+      // If the finish time is at the midnight between the finish date and the next day then
+      // this if condition will evaluate to false. Otherwise, e.g. when the finish date is at 20:00, we
+      // will adjust it to the right properly.
+      // Without this hack we would add one day to such tasks.
+      if (defaultTimeUnit.adjustLeft(finishDate).before(finishDate)) {
+        finishDate = defaultTimeUnit.adjustRight(finishDate);
+      }
+      getDurations(ProjectFileImporter.toJavaDate(t.start.toLocalDate()), finishDate);
     }
 
   private val DURATION_FROM_START_AND_DURATION: java.util.function.Function<net.sf.mpxj.Task, Pair<TimeDuration, TimeDuration>> =

ganttproject-builder/BUILD-HISTORY-MAJOR

@@ -5,4 +5,7 @@
 2024-09-30 3312 again, maybe now we will build pretty signed notarized packages
 2024-11-29 3313 update launchers in ZIP and dependencies in deb package with the latest Java runtimes
 2024-11-29 3313 again, now with the right build number
+2025-01-23 3315
+2025-01-23 3315 again, now with updated agreement with Apple
+2025-01-29 3316 fixed issue 2569, added group to MSI silent
 --

ganttproject-builder/BUILD-HISTORY-MINOR

@@ -7,3 +7,4 @@
 2024-09-20 3310 ganttproject,biz.ganttproject.app.localization,biz.ganttproject.core
 2024-09-21 3311 ganttproject,biz.ganttproject.app.localization,biz.ganttproject.core,org.ganttproject.impex.htmlpdf
 2025-01-14 3314 ganttproject,biz.ganttproject.app.localization
+2025-01-22 3315 ganttproject,biz.ganttproject.app.localization

ganttproject-tester/test/biz/ganttproject/impex/msproject2/ProjectCalendarTest.kt

@@ -26,6 +26,7 @@ import net.sf.mpxj.ProjectFile
 import net.sourceforge.ganttproject.GanttProjectImpl
 import net.sourceforge.ganttproject.TestSetupHelper
 import net.sourceforge.ganttproject.importer.ImporterFromGanttFile
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import java.awt.Color
 import java.io.File
@@ -55,6 +56,7 @@ fun initLocale() {
  * Tests project calendar export and import.
  */
 class ProjectCalendarTest: TestCase() {
+  @BeforeEach
   override fun setUp() {
     super.setUp()
     initLocale()
@@ -137,6 +139,19 @@ class ProjectCalendarTest: TestCase() {
       .setDate(2023, 0, 2)
       .build().get(Calendar.WEEK_OF_YEAR))
   }
+
+  @Test
+  fun `issue 2659`() {
+    val project = GanttProjectImpl()
+    val columns = ImporterFromGanttFile.VisibleFieldsImpl()
+    val fileUrl = ProjectCalendarTest::class.java.getResource("/issue2659.xml")
+    assertNotNull(fileUrl)
+    val importer = ProjectFileImporter(project, columns, File(fileUrl.toURI()))
+    importer.setPatchMspdi(false)
+    importer.run()
+
+    assertEquals(1, project.taskManager.tasks[0].duration.length)
+  }
 }
 
 fun Date.toLocalDate() = toInstant().atZone(ZoneId.systemDefault()).toLocalDate()

ganttproject/src/main/java/biz/ganttproject/platform/PgpUtil.kt

@@ -44,7 +44,7 @@ object PgpUtil {
   private val FP_CALC: KeyFingerPrintCalculator = BcKeyFingerprintCalculator()
 
   private val ourPublicKey by lazy {
-    val publicKeyResource = System.getProperty("app.update.public_key", "/ganttproject-3.3.3311.pub.asc")
+    val publicKeyResource = System.getProperty("app.update.public_key", "/ganttproject-3.3.3315.pub.asc")
     val publicKeyStream = Eclipsito::class.java.getResourceAsStream(publicKeyResource) ?:
       throw RuntimeException(
         "Failed to read the public key from $publicKeyResource. This resource is missing.".also { LOG.error(it) }