erikc5000 · erikc5000 · Oct 7, 2020 · Oct 7, 2020
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -5,6 +5,7 @@ object Versions {
     const val androidxTest = "1.2.0"
     const val googleTruth = "1.0.1"
     const val androidDesugarJdkLibs = "1.0.10"
+    const val javamath2kmp = "0.1.0"
 }
 
 object Libs {
@@ -25,4 +26,5 @@ object Libs {
 
     const val googleTruth = "com.google.truth:truth:${Versions.googleTruth}"
     const val androidDesugarJdkLibs = "com.android.tools:desugar_jdk_libs:${Versions.androidDesugarJdkLibs}"
+    const val javamath2kmp = "dev.erikchristensen.javamath2kmp:javamath2kmp:${Versions.javamath2kmp}"
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -14,6 +14,10 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             kotlin.srcDirs("src/commonMain/generated")
+
+            dependencies {
+                implementation(Libs.javamath2kmp)
+            }
         }
 
         val commonTest by getting {

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Centuries.kt b/core/src/commonMain/generated/io/islandtime/measures/_Centuries.kt
@@ -6,14 +6,14 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.DECADES_PER_CENTURY
 import io.islandtime.internal.MONTHS_PER_CENTURY
 import io.islandtime.internal.YEARS_PER_CENTURY
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import kotlin.Boolean
 import kotlin.Comparable
 import kotlin.Int

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Days.kt b/core/src/commonMain/generated/io/islandtime/measures/_Days.kt
@@ -6,18 +6,18 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.DAYS_PER_WEEK
 import io.islandtime.internal.HOURS_PER_DAY
 import io.islandtime.internal.MICROSECONDS_PER_DAY
 import io.islandtime.internal.MILLISECONDS_PER_DAY
 import io.islandtime.internal.MINUTES_PER_DAY
 import io.islandtime.internal.NANOSECONDS_PER_DAY
 import io.islandtime.internal.SECONDS_PER_DAY
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import kotlin.Boolean
 import kotlin.Comparable
 import kotlin.Int

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Decades.kt b/core/src/commonMain/generated/io/islandtime/measures/_Decades.kt
@@ -6,14 +6,14 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.DECADES_PER_CENTURY
 import io.islandtime.internal.MONTHS_PER_DECADE
 import io.islandtime.internal.YEARS_PER_DECADE
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import kotlin.Boolean
 import kotlin.Comparable
 import kotlin.Int

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Hours.kt b/core/src/commonMain/generated/io/islandtime/measures/_Hours.kt
@@ -6,17 +6,17 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.HOURS_PER_DAY
 import io.islandtime.internal.MICROSECONDS_PER_HOUR
 import io.islandtime.internal.MILLISECONDS_PER_HOUR
 import io.islandtime.internal.MINUTES_PER_HOUR
 import io.islandtime.internal.NANOSECONDS_PER_HOUR
 import io.islandtime.internal.SECONDS_PER_HOUR
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import kotlin.Boolean
 import kotlin.Comparable
 import kotlin.Int

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Microseconds.kt b/core/src/commonMain/generated/io/islandtime/measures/_Microseconds.kt
@@ -6,17 +6,17 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.MICROSECONDS_PER_DAY
 import io.islandtime.internal.MICROSECONDS_PER_HOUR
 import io.islandtime.internal.MICROSECONDS_PER_MILLISECOND
 import io.islandtime.internal.MICROSECONDS_PER_MINUTE
 import io.islandtime.internal.MICROSECONDS_PER_SECOND
 import io.islandtime.internal.NANOSECONDS_PER_MICROSECOND
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import io.islandtime.internal.toZeroPaddedString
 import kotlin.Boolean
 import kotlin.Comparable

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Milliseconds.kt b/core/src/commonMain/generated/io/islandtime/measures/_Milliseconds.kt
@@ -6,17 +6,17 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.MICROSECONDS_PER_MILLISECOND
 import io.islandtime.internal.MILLISECONDS_PER_DAY
 import io.islandtime.internal.MILLISECONDS_PER_HOUR
 import io.islandtime.internal.MILLISECONDS_PER_MINUTE
 import io.islandtime.internal.MILLISECONDS_PER_SECOND
 import io.islandtime.internal.NANOSECONDS_PER_MILLISECOND
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import io.islandtime.internal.toZeroPaddedString
 import kotlin.Boolean
 import kotlin.Comparable

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Minutes.kt b/core/src/commonMain/generated/io/islandtime/measures/_Minutes.kt
@@ -6,17 +6,17 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.MICROSECONDS_PER_MINUTE
 import io.islandtime.internal.MILLISECONDS_PER_MINUTE
 import io.islandtime.internal.MINUTES_PER_DAY
 import io.islandtime.internal.MINUTES_PER_HOUR
 import io.islandtime.internal.NANOSECONDS_PER_MINUTE
 import io.islandtime.internal.SECONDS_PER_MINUTE
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import kotlin.Boolean
 import kotlin.Comparable
 import kotlin.Int

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Months.kt b/core/src/commonMain/generated/io/islandtime/measures/_Months.kt
@@ -6,14 +6,14 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.MONTHS_PER_CENTURY
 import io.islandtime.internal.MONTHS_PER_DECADE
 import io.islandtime.internal.MONTHS_PER_YEAR
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import kotlin.Boolean
 import kotlin.Comparable
 import kotlin.Int

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Nanoseconds.kt b/core/src/commonMain/generated/io/islandtime/measures/_Nanoseconds.kt
@@ -6,17 +6,17 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.NANOSECONDS_PER_DAY
 import io.islandtime.internal.NANOSECONDS_PER_HOUR
 import io.islandtime.internal.NANOSECONDS_PER_MICROSECOND
 import io.islandtime.internal.NANOSECONDS_PER_MILLISECOND
 import io.islandtime.internal.NANOSECONDS_PER_MINUTE
 import io.islandtime.internal.NANOSECONDS_PER_SECOND
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import io.islandtime.internal.toZeroPaddedString
 import kotlin.Boolean
 import kotlin.Comparable

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Seconds.kt b/core/src/commonMain/generated/io/islandtime/measures/_Seconds.kt
@@ -6,17 +6,17 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.MICROSECONDS_PER_SECOND
 import io.islandtime.internal.MILLISECONDS_PER_SECOND
 import io.islandtime.internal.NANOSECONDS_PER_SECOND
 import io.islandtime.internal.SECONDS_PER_DAY
 import io.islandtime.internal.SECONDS_PER_HOUR
 import io.islandtime.internal.SECONDS_PER_MINUTE
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import kotlin.Boolean
 import kotlin.Comparable
 import kotlin.Int

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Weeks.kt b/core/src/commonMain/generated/io/islandtime/measures/_Weeks.kt
@@ -6,12 +6,12 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.DAYS_PER_WEEK
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import kotlin.Boolean
 import kotlin.Comparable
 import kotlin.Int

diff --git a/core/src/commonMain/generated/io/islandtime/measures/_Years.kt b/core/src/commonMain/generated/io/islandtime/measures/_Years.kt
@@ -6,14 +6,14 @@
 
 package io.islandtime.measures
 
+import dev.erikchristensen.javamath2kmp.minusExact
+import dev.erikchristensen.javamath2kmp.negateExact
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.internal.MONTHS_PER_YEAR
 import io.islandtime.internal.YEARS_PER_CENTURY
 import io.islandtime.internal.YEARS_PER_DECADE
-import io.islandtime.internal.minusExact
-import io.islandtime.internal.negateExact
-import io.islandtime.internal.plusExact
-import io.islandtime.internal.timesExact
-import io.islandtime.internal.toIntExact
 import kotlin.Boolean
 import kotlin.Comparable
 import kotlin.Int

diff --git a/core/src/commonMain/kotlin/io/islandtime/Conversions.kt b/core/src/commonMain/kotlin/io/islandtime/Conversions.kt
@@ -3,9 +3,9 @@
 
 package io.islandtime
 
+import dev.erikchristensen.javamath2kmp.floorDiv
 import io.islandtime.base.TimePoint
 import io.islandtime.internal.SECONDS_PER_DAY
-import io.islandtime.internal.floorDiv
 import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName
 

diff --git a/core/src/commonMain/kotlin/io/islandtime/Date.kt b/core/src/commonMain/kotlin/io/islandtime/Date.kt
@@ -2,6 +2,9 @@
 
 package io.islandtime
 
+import dev.erikchristensen.javamath2kmp.floorDiv
+import dev.erikchristensen.javamath2kmp.floorMod
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.base.DateTimeField
 import io.islandtime.internal.*
 import io.islandtime.measures.*

diff --git a/core/src/commonMain/kotlin/io/islandtime/DateTime.kt b/core/src/commonMain/kotlin/io/islandtime/DateTime.kt
@@ -1,5 +1,7 @@
 package io.islandtime
 
+import dev.erikchristensen.javamath2kmp.floorDiv
+import dev.erikchristensen.javamath2kmp.floorMod
 import io.islandtime.internal.*
 import io.islandtime.measures.*
 import io.islandtime.parser.*
@@ -115,7 +117,8 @@ class DateTime(
         ReplaceWith("this.toYearMonth()"),
         DeprecationLevel.ERROR
     )
-    inline val yearMonth: YearMonth get() = toYearMonth()
+    inline val yearMonth: YearMonth
+        get() = toYearMonth()
 
     /**
      * Returns this date-time with [period] added to it.
@@ -590,7 +593,7 @@ class DateTime(
             val localMilliseconds = millisecondsSinceUnixEpoch + offset.totalSeconds
             val localEpochDay = localMilliseconds.value floorDiv MILLISECONDS_PER_DAY
             val nanosecondOfDay =
-                (localMilliseconds.value floorMod MILLISECONDS_PER_DAY).milliseconds.inNanosecondsUnchecked.value
+                (localMilliseconds.value floorMod MILLISECONDS_PER_DAY).milliseconds.inNanoseconds.value
             val date = Date.fromDayOfUnixEpoch(localEpochDay)
             val time = Time.fromNanosecondOfDay(nanosecondOfDay)
             return DateTime(date, time)

diff --git a/core/src/commonMain/kotlin/io/islandtime/Instant.kt b/core/src/commonMain/kotlin/io/islandtime/Instant.kt
@@ -2,6 +2,10 @@
 
 package io.islandtime
 
+import dev.erikchristensen.javamath2kmp.floorDiv
+import dev.erikchristensen.javamath2kmp.floorMod
+import dev.erikchristensen.javamath2kmp.plusExact
+import dev.erikchristensen.javamath2kmp.timesExact
 import io.islandtime.base.DateTimeField
 import io.islandtime.base.TimePoint
 import io.islandtime.internal.*

diff --git a/core/src/commonMain/kotlin/io/islandtime/Time.kt b/core/src/commonMain/kotlin/io/islandtime/Time.kt
@@ -1,5 +1,6 @@
 package io.islandtime
 
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.base.DateTimeField
 import io.islandtime.internal.*
 import io.islandtime.measures.*

diff --git a/core/src/commonMain/kotlin/io/islandtime/UtcOffset.kt b/core/src/commonMain/kotlin/io/islandtime/UtcOffset.kt
@@ -2,9 +2,9 @@
 
 package io.islandtime
 
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.base.DateTimeField
 import io.islandtime.internal.appendZeroPadded
-import io.islandtime.internal.toIntExact
 import io.islandtime.measures.*
 import io.islandtime.parser.*
 import kotlin.math.absoluteValue

diff --git a/core/src/commonMain/kotlin/io/islandtime/YearMonth.kt b/core/src/commonMain/kotlin/io/islandtime/YearMonth.kt
@@ -1,7 +1,11 @@
 package io.islandtime
 
+import dev.erikchristensen.javamath2kmp.floorDiv
+import dev.erikchristensen.javamath2kmp.floorMod
+import dev.erikchristensen.javamath2kmp.toIntExact
 import io.islandtime.base.DateTimeField
-import io.islandtime.internal.*
+import io.islandtime.internal.MONTHS_PER_YEAR
+import io.islandtime.internal.appendZeroPadded
 import io.islandtime.measures.*
 import io.islandtime.parser.*
 import io.islandtime.ranges.DateRange

diff --git a/core/src/commonMain/kotlin/io/islandtime/internal/Extensions.kt b/core/src/commonMain/kotlin/io/islandtime/internal/Extensions.kt
@@ -1,8 +1,5 @@
 package io.islandtime.internal
 
-internal infix fun Long.plusExact(other: Int): Long = this plusExact other.toLong()
-internal infix fun Long.minusExact(other: Int): Long = this minusExact other.toLong()
-
 /**
  * Append a number to a string, padding it with zeros as necessary to reach a desired length
  * @param number The number to pad -- must be positive or zero

diff --git a/core/src/commonMain/kotlin/io/islandtime/internal/Instants.kt b/core/src/commonMain/kotlin/io/islandtime/internal/Instants.kt
@@ -1,5 +1,6 @@
 package io.islandtime.internal
 
+import dev.erikchristensen.javamath2kmp.floorDiv
 import io.islandtime.*
 
 internal fun toTimeAt(offset: UtcOffset, secondOfUnixEpoch: Long, nanosecond: Int): Time {