Bump minimum Java version to 11

build.gradle.kts

@@ -2,6 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.dokka.gradle.DokkaTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     kotlin("multiplatform") version "1.8.0"
@@ -139,8 +140,8 @@ publishing {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = "1.8"
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_11)
     }
 }
 

src/commonMain/kotlin/ExactMath.kt

@@ -35,13 +35,7 @@ infix fun Long.minusExact(other: Int): Long = this minusExact other.toLong()
  * Returns the product of this value and another value, throwing an exception if overflow occurs.
  * @throws ArithmeticException if overflow occurs
  */
-infix fun Long.timesExact(other: Int): Long = this timesExact other.toLong()
-
-/**
- * Returns the product of this value and another value, throwing an exception if overflow occurs.
- * @throws ArithmeticException if overflow occurs
- */
-infix fun Int.timesExact(other: Long): Long = this.toLong() timesExact other
+infix fun Int.timesExact(other: Long): Long = other timesExact this
 
 /**
  * Returns the absolute value of a number, throwing an exception if overflow occurs.

src/commonMain/kotlin/Platform.kt

@@ -82,6 +82,12 @@ expect infix fun Long.timesExact(other: Long): Long
  */
 expect infix fun Int.timesExact(other: Int): Int
 
+/**
+ * Returns the product of this value and another value, throwing an exception if overflow occurs.
+ * @throws ArithmeticException if overflow occurs
+ */
+expect infix fun Long.timesExact(other: Int): Long
+
 /**
  * Returns the negation of this value, throwing an exception if overflow occurs.
  * @throws ArithmeticException if overflow occurs

src/jvmMain/kotlin/Platform.kt

@@ -6,12 +6,12 @@ package dev.erikchristensen.javamath2kmp
 actual infix fun Long.floorMod(other: Long): Long = Math.floorMod(this, other)
 actual infix fun Int.floorMod(other: Int): Int = Math.floorMod(this, other)
 actual infix fun Int.floorMod(other: Long): Long = this.toLong() floorMod other
-actual infix fun Long.floorMod(other: Int): Int = (this floorMod other.toLong()).toInt()
+actual infix fun Long.floorMod(other: Int): Int = Math.floorMod(this, other)
 
 actual infix fun Long.floorDiv(other: Long): Long = Math.floorDiv(this, other)
 actual infix fun Int.floorDiv(other: Int): Int = Math.floorDiv(this, other)
 actual infix fun Int.floorDiv(other: Long): Long = this.toLong() floorDiv other
-actual infix fun Long.floorDiv(other: Int): Long = this floorDiv other.toLong()
+actual infix fun Long.floorDiv(other: Int): Long = Math.floorDiv(this, other)
 
 actual infix fun Long.plusExact(other: Long): Long = Math.addExact(this, other)
 actual infix fun Int.plusExact(other: Int): Int = Math.addExact(this, other)
@@ -21,6 +21,7 @@ actual infix fun Int.minusExact(other: Int): Int = Math.subtractExact(this, othe
 
 actual infix fun Long.timesExact(other: Long): Long = Math.multiplyExact(this, other)
 actual infix fun Int.timesExact(other: Int): Int = Math.multiplyExact(this, other)
+actual infix fun Long.timesExact(other: Int): Long = Math.multiplyExact(this, other)
 
 actual fun Int.negateExact(): Int = Math.negateExact(this)
 actual fun Long.negateExact(): Long = Math.negateExact(this)

src/nativeJsMain/kotlin/Platform.kt

@@ -83,6 +83,8 @@ actual infix fun Int.timesExact(other: Int): Int {
     return total.toInt()
 }
 
+actual infix fun Long.timesExact(other: Int): Long = this timesExact other.toLong()
+
 actual fun Int.negateExact(): Int {
     if (this == Int.MIN_VALUE) {
         throw ArithmeticException("'$this' can't be negated without overflow")