Split math.kt into math.kt and dateCalculations.kt

core/common/src/DateTimePeriod.kt

@@ -5,6 +5,7 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.DatePeriodIso8601Serializer
 import kotlinx.datetime.serializers.DateTimePeriodIso8601Serializer
 import kotlin.math.*

core/common/src/DateTimeUnit.kt

@@ -5,6 +5,7 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.safeMultiply
 import kotlinx.datetime.serializers.*
 import kotlinx.serialization.Serializable
 import kotlin.time.*

core/common/src/Instant.kt

@@ -5,6 +5,7 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.InstantIso8601Serializer
 import kotlinx.serialization.Serializable
 import kotlin.time.*

core/common/src/internal/dateCalculations.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2019-2022 JetBrains s.r.o. and contributors.
+ * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
+ */
+
+package kotlinx.datetime.internal
+
+internal const val SECONDS_PER_HOUR = 60 * 60
+
+internal const val SECONDS_PER_MINUTE = 60
+
+internal const val MINUTES_PER_HOUR = 60
+
+internal const val HOURS_PER_DAY = 24
+
+internal const val SECONDS_PER_DAY: Int = SECONDS_PER_HOUR * HOURS_PER_DAY
+
+internal const val NANOS_PER_ONE = 1_000_000_000
+internal const val NANOS_PER_MILLI = 1_000_000
+internal const val MILLIS_PER_ONE = 1_000
+
+internal const val NANOS_PER_DAY: Long = NANOS_PER_ONE * SECONDS_PER_DAY.toLong()
+
+internal const val NANOS_PER_MINUTE: Long = NANOS_PER_ONE * SECONDS_PER_MINUTE.toLong()
+
+internal const val NANOS_PER_HOUR = NANOS_PER_ONE * SECONDS_PER_HOUR.toLong()
+
+internal const val MILLIS_PER_DAY: Int = SECONDS_PER_DAY * MILLIS_PER_ONE
+
+// org.threeten.bp.chrono.IsoChronology#isLeapYear
+internal fun isLeapYear(year: Int): Boolean {
+    val prolepticYear: Long = year.toLong()
+    return prolepticYear and 3 == 0L && (prolepticYear % 100 != 0L || prolepticYear % 400 == 0L)
+}
+
+internal fun Int.monthLength(isLeapYear: Boolean): Int =
+    when (this) {
+        2 -> if (isLeapYear) 29 else 28
+        4, 6, 9, 11 -> 30
+        else -> 31
+    }

core/common/src/math.kt → core/common/src/internal/math.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
  */
 
-package kotlinx.datetime
+package kotlinx.datetime.internal
 
 internal fun Long.clampToInt(): Int =
         when {
@@ -12,28 +12,6 @@ internal fun Long.clampToInt(): Int =
             else -> toInt()
         }
 
-internal const val SECONDS_PER_HOUR = 60 * 60
-
-internal const val SECONDS_PER_MINUTE = 60
-
-internal const val MINUTES_PER_HOUR = 60
-
-internal const val HOURS_PER_DAY = 24
-
-internal const val SECONDS_PER_DAY: Int = SECONDS_PER_HOUR * HOURS_PER_DAY
-
-internal const val NANOS_PER_ONE = 1_000_000_000
-internal const val NANOS_PER_MILLI = 1_000_000
-internal const val MILLIS_PER_ONE = 1_000
-
-internal const val NANOS_PER_DAY: Long = NANOS_PER_ONE * SECONDS_PER_DAY.toLong()
-
-internal const val NANOS_PER_MINUTE: Long = NANOS_PER_ONE * SECONDS_PER_MINUTE.toLong()
-
-internal const val NANOS_PER_HOUR = NANOS_PER_ONE * SECONDS_PER_HOUR.toLong()
-
-internal const val MILLIS_PER_DAY: Int = SECONDS_PER_DAY * MILLIS_PER_ONE
-
 internal expect fun safeMultiply(a: Long, b: Long): Long
 internal expect fun safeMultiply(a: Int, b: Int): Int
 internal expect fun safeAdd(a: Long, b: Long): Long
@@ -201,16 +179,3 @@ internal fun multiplyAndAdd(d: Long, n: Long, r: Long): Long {
     }
     return safeAdd(safeMultiply(md, n), mr)
 }
-
-// org.threeten.bp.chrono.IsoChronology#isLeapYear
-internal fun isLeapYear(year: Int): Boolean {
-    val prolepticYear: Long = year.toLong()
-    return prolepticYear and 3 == 0L && (prolepticYear % 100 != 0L || prolepticYear % 400 == 0L)
-}
-
-internal fun Int.monthLength(isLeapYear: Boolean): Int =
-    when (this) {
-        2 -> if (isLeapYear) 29 else 28
-        4, 6, 9, 11 -> 30
-        else -> 31
-    }

core/common/test/InstantTest.kt

@@ -7,6 +7,7 @@ package kotlinx.datetime.test
 
 import kotlinx.datetime.*
 import kotlinx.datetime.Clock // currently, requires an explicit import due to a conflict with the deprecated Clock from kotlin.time
+import kotlinx.datetime.internal.*
 import kotlin.random.*
 import kotlin.test.*
 import kotlin.time.*

core/common/test/LocalDateTest.kt

@@ -6,6 +6,7 @@
 package kotlinx.datetime.test
 
 import kotlinx.datetime.*
+import kotlinx.datetime.internal.*
 import kotlin.random.*
 import kotlin.test.*
 

core/common/test/LocalTimeTest.kt

@@ -6,6 +6,7 @@
 package kotlinx.datetime.test
 
 import kotlinx.datetime.*
+import kotlinx.datetime.internal.*
 import kotlin.math.*
 import kotlin.random.*
 import kotlin.test.*

core/common/test/MultiplyAndDivideTest.kt

@@ -6,7 +6,7 @@
 package kotlinx.datetime.test
 import kotlin.random.*
 import kotlin.test.*
-import kotlinx.datetime.*
+import kotlinx.datetime.internal.*
 
 class MultiplyAndDivideTest {
 

core/js/src/Instant.kt

@@ -11,6 +11,8 @@ import kotlinx.datetime.internal.JSJoda.OffsetDateTime as jtOffsetDateTime
 import kotlinx.datetime.internal.JSJoda.Duration as jtDuration
 import kotlinx.datetime.internal.JSJoda.Clock as jtClock
 import kotlinx.datetime.internal.JSJoda.ChronoUnit
+import kotlinx.datetime.internal.safeAdd
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.InstantIso8601Serializer
 import kotlinx.serialization.Serializable
 import kotlin.time.*

core/js/src/LocalTime.kt

@@ -4,6 +4,7 @@
  */
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.LocalTimeIso8601Serializer
 import kotlinx.serialization.Serializable
 import kotlinx.datetime.internal.JSJoda.LocalTime as jtLocalTime

core/js/src/mathJs.kt → core/js/src/internal/mathJs.kt

@@ -1,9 +1,9 @@
 /*
- * Copyright 2019-2020 JetBrains s.r.o.
+ * Copyright 2019-2022 JetBrains s.r.o. and contributors.
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
  */
 
-package kotlinx.datetime
+package kotlinx.datetime.internal
 
 /**
  * Safely adds two long values.

core/jvm/src/Instant.kt

@@ -6,6 +6,8 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.safeMultiply
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.InstantIso8601Serializer
 import kotlinx.serialization.Serializable
 import java.time.DateTimeException

core/jvm/src/LocalDate.kt

@@ -5,6 +5,9 @@
 @file:JvmName("LocalDateJvmKt")
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.safeAdd
+import kotlinx.datetime.internal.safeMultiply
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.LocalDateIso8601Serializer
 import kotlinx.serialization.Serializable
 import java.time.DateTimeException

core/jvm/src/LocalTime.kt

@@ -6,6 +6,7 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.LocalTimeIso8601Serializer
 import kotlinx.serialization.Serializable
 import java.time.DateTimeException

core/jvm/src/mathJvm.kt → core/jvm/src/internal/mathJvm.kt

@@ -1,9 +1,9 @@
 /*
- * Copyright 2019-2020 JetBrains s.r.o.
+ * Copyright 2019-2022 JetBrains s.r.o. and contributors.
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
  */
 
-package kotlinx.datetime
+package kotlinx.datetime.internal
 
 internal actual fun safeMultiply(a: Long, b: Long): Long = Math.multiplyExact(a, b)
 internal actual fun safeMultiply(a: Int, b: Int): Int = Math.multiplyExact(a, b)

core/native/cinterop_actuals/TimeZoneNative.kt

@@ -6,6 +6,7 @@ package kotlinx.datetime
 
 import kotlinx.datetime.internal.*
 import kotlinx.cinterop.*
+import kotlinx.datetime.internal.*
 import platform.posix.free
 
 internal actual class RegionTimeZone(private val tzid: TZID, actual override val id: String): TimeZone() {

core/native/src/Instant.kt

@@ -8,6 +8,7 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.InstantIso8601Serializer
 import kotlinx.serialization.Serializable
 import kotlin.math.*

core/native/src/LocalDate.kt

@@ -8,6 +8,9 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.*
+import kotlinx.datetime.internal.safeAdd
+import kotlinx.datetime.internal.safeMultiply
 import kotlinx.datetime.serializers.LocalDateIso8601Serializer
 import kotlinx.serialization.Serializable
 import kotlin.math.*

core/native/src/LocalDateTime.kt

@@ -8,6 +8,7 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.LocalDateTimeIso8601Serializer
 import kotlinx.serialization.Serializable
 

core/native/src/LocalTime.kt

@@ -8,6 +8,7 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.LocalTimeIso8601Serializer
 import kotlinx.serialization.Serializable
 

core/native/src/TimeZone.kt

@@ -8,6 +8,7 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.*
 import kotlinx.serialization.Serializable
 

core/native/src/UtcOffset.kt

@@ -5,6 +5,7 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.UtcOffsetSerializer
 import kotlinx.serialization.Serializable
 import kotlin.math.abs

core/native/src/internal/dateCalculations.kt

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2019-2022 JetBrains s.r.o. and contributors.
+ * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
+ */
+
+package kotlinx.datetime.internal
+
+import kotlin.math.*
+
+/**
+ * All code below was taken from various places of https://github.com/ThreeTen/threetenbp with few changes
+ */
+
+/**
+ * The number of days in a 400 year cycle.
+ */
+internal const val DAYS_PER_CYCLE = 146097
+
+/**
+ * The number of days from year zero to year 1970.
+ * There are five 400 year cycles from year zero to 2000.
+ * There are 7 leap years from 1970 to 2000.
+ */
+internal const val DAYS_0000_TO_1970 = DAYS_PER_CYCLE * 5 - (30 * 365 + 7)
+
+// days in a 400 year cycle = 146097
+// days in a 10,000 year cycle = 146097 * 25
+// seconds per day = 86400
+internal const val SECONDS_PER_10000_YEARS = 146097L * 25L * 86400L
+
+internal const val SECONDS_0000_TO_1970 = (146097L * 5L - (30L * 365L + 7L)) * 86400L
+
+// org.threeten.bp.ZoneOffset#buildId
+internal fun zoneIdByOffset(totalSeconds: Int): String {
+    return if (totalSeconds == 0) {
+        "Z"
+    } else {
+        val absTotalSeconds: Int = abs(totalSeconds)
+        val buf = StringBuilder()
+        val absHours: Int = absTotalSeconds / SECONDS_PER_HOUR
+        val absMinutes: Int = absTotalSeconds / SECONDS_PER_MINUTE % MINUTES_PER_HOUR
+        buf.append(if (totalSeconds < 0) "-" else "+")
+            .append(if (absHours < 10) "0" else "").append(absHours)
+            .append(if (absMinutes < 10) ":0" else ":").append(absMinutes)
+        val absSeconds: Int = absTotalSeconds % SECONDS_PER_MINUTE
+        if (absSeconds != 0) {
+            buf.append(if (absSeconds < 10) ":0" else ":").append(absSeconds)
+        }
+        buf.toString()
+    }
+}

core/native/src/mathNative.kt → core/native/src/internal/mathNative.kt

@@ -1,36 +1,12 @@
 /*
- * Copyright 2019-2020 JetBrains s.r.o.
+ * Copyright 2019-2022 JetBrains s.r.o. and contributors.
  * Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
  */
+
 /* Based on the ThreeTenBp project.
  * Copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos
  */
-package kotlinx.datetime
-
-import kotlin.math.abs
-
-/**
- * All code below was taken from various places of https://github.com/ThreeTen/threetenbp with few changes
- */
-
-/**
- * The number of days in a 400 year cycle.
- */
-internal const val DAYS_PER_CYCLE = 146097
-
-/**
- * The number of days from year zero to year 1970.
- * There are five 400 year cycles from year zero to 2000.
- * There are 7 leap years from 1970 to 2000.
- */
-internal const val DAYS_0000_TO_1970 = DAYS_PER_CYCLE * 5 - (30 * 365 + 7)
-
-// days in a 400 year cycle = 146097
-// days in a 10,000 year cycle = 146097 * 25
-// seconds per day = 86400
-internal const val SECONDS_PER_10000_YEARS = 146097L * 25L * 86400L
-
-internal const val SECONDS_0000_TO_1970 = (146097L * 5L - (30L * 365L + 7L)) * 86400L
+package kotlinx.datetime.internal
 
 /**
  * Safely adds two long values.
@@ -97,24 +73,4 @@ internal actual fun safeMultiply(a: Int, b: Int): Int {
         throw ArithmeticException("Multiplication overflows an int: $a * $b")
     }
     return total.toInt()
-}
-
-// org.threeten.bp.ZoneOffset#buildId
-internal fun zoneIdByOffset(totalSeconds: Int): String {
-    return if (totalSeconds == 0) {
-        "Z"
-    } else {
-        val absTotalSeconds: Int = abs(totalSeconds)
-        val buf = StringBuilder()
-        val absHours: Int = absTotalSeconds / SECONDS_PER_HOUR
-        val absMinutes: Int = absTotalSeconds / SECONDS_PER_MINUTE % MINUTES_PER_HOUR
-        buf.append(if (totalSeconds < 0) "-" else "+")
-            .append(if (absHours < 10) "0" else "").append(absHours)
-            .append(if (absMinutes < 10) ":0" else ":").append(absMinutes)
-        val absSeconds: Int = absTotalSeconds % SECONDS_PER_MINUTE
-        if (absSeconds != 0) {
-            buf.append(if (absSeconds < 10) ":0" else ":").append(absSeconds)
-        }
-        buf.toString()
-    }
 }