ekrich · ekrich · Jan 16, 2025 · Jan 10, 2025 · Jan 10, 2025 · Jan 10, 2025
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,10 +5,10 @@ on:
   pull_request:
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        java: [ '11', '17' ]
+        java: [ '17', '21' ]
     name: Test using Java ${{ matrix.java }}
     steps:
     - uses: actions/checkout@v3
@@ -17,4 +17,5 @@ jobs:
       with:
           distribution: 'adopt'
           java-version: ${{ matrix.java }}
+    - uses: sbt/setup-sbt@v1
     - run: sbt +test
diff --git a/sjavatime/js/src/main/scala/java/time/PlatformSpecific.scala b/sjavatime/js/src/main/scala/java/time/PlatformSpecific.scala
@@ -1,6 +1,7 @@
 package java.time
 
 import scala.scalajs.js
+import java.time.Constants.NANOS_IN_MILLI
 
 private[time] object PlatformSpecific extends PlatformCommon {
   def localDate(): LocalDate = {
@@ -16,7 +17,7 @@ private[time] object PlatformSpecific extends PlatformCommon {
 
   def localTime(): LocalTime = {
     val date = new js.Date()
-    val nano = date.getMilliseconds().toInt * 1000000
+    val nano = date.getMilliseconds().toInt * NANOS_IN_MILLI
     LocalTime.of(date.getHours().toInt, date.getMinutes().toInt,
         date.getSeconds().toInt, nano)
   }

diff --git a/sjavatime/native/src/main/scala/java/time/PlatformSpecific.scala b/sjavatime/native/src/main/scala/java/time/PlatformSpecific.scala
@@ -3,6 +3,8 @@ package java.time
 import scala.scalanative.unsafe.extern
 import scala.scalanative.unsafe.CLongLong
 
+import java.time.Constants._
+
 @extern object UseFFI {
   def scalanative_time_zone_offset(): CLongLong = extern
 }
@@ -31,13 +33,16 @@ private[time] object PlatformSpecific extends PlatformCommon {
     val offsetSeconds = epochSeconds + offset
     val nanos = now.getNano()
     // sec/yr, sec/day
-    val secPerDay = ((offsetSeconds % 31536000) % 86400)
+    // Bug: this needs to adjust for leap year ?
+    val secPerDay = ((offsetSeconds % SECONDS_IN_YEAR) % SECONDS_IN_DAY)
     // sec/hr
-    val currentHours = Math.floor((secPerDay / 3600).toDouble).toInt
-    val secPerHour = secPerDay % 3600
+    val currentHours = Math.floor((secPerDay / SECONDS_IN_HOUR).toDouble).toInt
+    val secPerHour = secPerDay % SECONDS_IN_HOUR
     // sec/min
-    val currentMinutes = Math.floor((secPerHour / 60).toDouble).toInt
-    val currentSeconds = Math.floor((secPerHour % 60).toDouble).toInt
+    val currentMinutes =
+      Math.floor((secPerHour / SECONDS_IN_MINUTE).toDouble).toInt
+    val currentSeconds =
+      Math.floor((secPerHour % SECONDS_IN_MINUTE).toDouble).toInt
     LocalTime.of(currentHours, currentMinutes, currentSeconds, nanos)
   }
 

diff --git a/sjavatime/shared/src/main/scala/java/time/Constants.scala b/sjavatime/shared/src/main/scala/java/time/Constants.scala
@@ -49,5 +49,9 @@ private[time] object Constants {
 
   final val DAYS_IN_LEAP_YEAR = 366
 
+  final val SECONDS_IN_LEAP_YEAR = SECONDS_IN_DAY * DAYS_IN_LEAP_YEAR
+
   final val DAYS_IN_YEAR = 365
+
+  final val SECONDS_IN_YEAR = SECONDS_IN_DAY * DAYS_IN_YEAR
 }
diff --git a/testSuite/js/src/test/scala/org/scalajs/testsuite/utils/Platform.scala b/testSuite/js/src/test/scala/org/scalajs/testsuite/utils/Platform.scala
@@ -20,4 +20,6 @@ object Platform {
 
   final val executingInJVMOnHigherThanJDK8 = false
 
+  def executingInJVMLessThan(version: Int) = false
+
 }
diff --git a/testSuite/jvm/src/test/scala/org/scalajs/testsuite/utils/Platform.scala b/testSuite/jvm/src/test/scala/org/scalajs/testsuite/utils/Platform.scala
@@ -11,6 +11,8 @@ object Platform {
 
   def executingInJVMOnHigherThanJDK8 = jdkVersion > 8
 
+  def executingInJVMLessThan(version: Int) = jdkVersion < version
+
   private lazy val jdkVersion = {
     val v = System.getProperty("java.version")
     if (v.startsWith("1.")) Integer.parseInt(v.drop(2).takeWhile(_.isDigit))

diff --git a/testSuite/native/src/test/scala/org/scalajs/testsuite/utils/Platform.scala b/testSuite/native/src/test/scala/org/scalajs/testsuite/utils/Platform.scala
@@ -11,4 +11,6 @@ object Platform {
 
   final val executingInJVMOnHigherThanJDK8 = false
 
+  def executingInJVMLessThan(version: Int) = false
+
 }
diff --git a/testSuite/shared/src/test/scala/org/scalajs/testsuite/javalib/time/InstantTest.scala b/testSuite/shared/src/test/scala/org/scalajs/testsuite/javalib/time/InstantTest.scala
@@ -10,6 +10,7 @@ import org.junit.Test
 import org.junit.Assert.assertEquals
 import org.scalajs.testsuite.utils.AssertThrows.assertThrows
 import org.scalajs.testsuite.utils.Platform.executingInJVMOnJDK8
+import org.scalajs.testsuite.utils.Platform.executingInJVMLessThan
 
 /** Created by alonsodomin on 26/12/2015. */
 class InstantTest extends TemporalTest[Instant] {
@@ -396,8 +397,15 @@ class InstantTest extends TemporalTest[Instant] {
     assertEquals(1460970000731L, Instant.MIN.until(Instant.MAX, HALF_DAYS))
     assertEquals(730485000365L, Instant.MIN.until(Instant.MAX, DAYS))
 
-    assertEquals(84756266270854L,
-        someNegativeInstant.until(somePositiveInstant, MILLIS))
+    // See https://bugs.openjdk.org/browse/JDK-8307466
+    // Fixed in 21 backport to 20
+    if (executingInJVMLessThan(20)) {
+      assertEquals(84756266270854L,
+          someNegativeInstant.until(somePositiveInstant, MILLIS))
+    } else {
+      // assertEquals(84756266270853L,
+      //     someNegativeInstant.until(somePositiveInstant, MILLIS))
+    }
     assertEquals(84756266270L,
         someNegativeInstant.until(somePositiveInstant, SECONDS))
     assertEquals(1412604437L,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,6 @@ object Platform {

		final val executingInJVMOnHigherThanJDK8 = false

		def executingInJVMLessThan(version: Int) = false

		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,6 @@ object Platform {

		final val executingInJVMOnHigherThanJDK8 = false

		def executingInJVMLessThan(version: Int) = false

		}