Bump Kotlin to 1.5.0-RC (#19)

erikc5000 · Apr 26, 2021 · 8c42e06 · 8c42e06
1 parent c76c531
commit 8c42e06
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 42 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.dokka.gradle.DokkaTask
 
 plugins {
-    kotlin("multiplatform") version "1.4.30"
+    kotlin("multiplatform") version "1.5.0-RC"
     id("org.jetbrains.dokka") version "1.4.32"
     `maven-publish`
     signing
@@ -51,16 +51,8 @@ kotlin {
         }
 
         val commonTest by getting {
-            dependencies {
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
-        }
-
-        val jvmTest by getting {
             dependencies {
                 implementation(kotlin("test"))
-                implementation(kotlin("test-junit"))
             }
         }
 
@@ -75,12 +67,6 @@ kotlin {
                 dependsOn(commonTest)
             }
 
-            val jsTest by getting {
-                dependencies {
-                    implementation(kotlin("test-js"))
-                }
-            }
-
             configure(otherTargets) {
                 compilations["main"].defaultSourceSet.dependsOn(nativeJsMain)
                 compilations["test"].defaultSourceSet.dependsOn(nativeJsTest)
@@ -90,10 +76,10 @@ kotlin {
 }
 
 val javadocJar by tasks.registering(Jar::class) {
-    val dokkaJavadoc = tasks.named<DokkaTask>("dokkaHtml")
-    dependsOn(dokkaJavadoc)
+    val dokkaHtml = tasks.named<DokkaTask>("dokkaHtml")
+    dependsOn(dokkaHtml)
     archiveClassifier.set("javadoc")
-    from(dokkaJavadoc.get().outputDirectory)
+    from(dokkaHtml.get().outputDirectory)
 }
 
 signing {
@@ -159,7 +145,6 @@ publishing {
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
         jvmTarget = "1.8"
-        useIR = true
     }
 }
 

diff --git a/src/commonMain/kotlin/Extensions.kt → src/commonMain/kotlin/ExactMath.kt b/src/commonMain/kotlin/Extensions.kt → src/commonMain/kotlin/ExactMath.kt
@@ -1,4 +1,10 @@
+@file:JvmMultifileClass
+@file:JvmName("MathKt")
+
 package dev.erikchristensen.javamath2kmp
 
+import kotlin.jvm.JvmMultifileClass
+import kotlin.jvm.JvmName
+
 infix fun Long.plusExact(other: Int): Long = this plusExact other.toLong()
 infix fun Long.minusExact(other: Int): Long = this minusExact other.toLong()
diff --git a/src/commonMain/kotlin/Math.kt → src/commonMain/kotlin/Platform.kt b/src/commonMain/kotlin/Math.kt → src/commonMain/kotlin/Platform.kt
@@ -1,5 +1,11 @@
+@file:JvmMultifileClass
+@file:JvmName("MathKt")
+
 package dev.erikchristensen.javamath2kmp
 
+import kotlin.jvm.JvmMultifileClass
+import kotlin.jvm.JvmName
+
 expect infix fun Long.floorMod(other: Long): Long
 expect infix fun Int.floorMod(other: Int): Int
 expect infix fun Long.floorMod(other: Int): Int

diff --git a/src/jvmMain/kotlin/Math.kt → src/jvmMain/kotlin/Platform.kt b/src/jvmMain/kotlin/Math.kt → src/jvmMain/kotlin/Platform.kt
@@ -1,3 +1,6 @@
+@file:JvmMultifileClass
+@file:JvmName("MathKt")
+
 package dev.erikchristensen.javamath2kmp
 
 actual infix fun Long.floorMod(other: Long): Long = Math.floorMod(this, other)

diff --git a/src/nativeJsMain/kotlin/Math.kt → src/nativeJsMain/kotlin/Platform.kt b/src/nativeJsMain/kotlin/Math.kt → src/nativeJsMain/kotlin/Platform.kt
@@ -1,30 +1,15 @@
 package dev.erikchristensen.javamath2kmp
 
-actual infix fun Long.floorMod(other: Long): Long = (this % other + other) % other
-actual infix fun Int.floorMod(other: Int): Int = (this % other + other) % other
-actual infix fun Long.floorMod(other: Int): Int = (this floorMod other.toLong()).toInt()
+import kotlin.mod as kotlinMod
+import kotlin.floorDiv as kotlinFloorDiv
 
-actual infix fun Long.floorDiv(other: Long): Long {
-    val result = this / other
+actual infix fun Long.floorMod(other: Long): Long = kotlinMod(other)
+actual infix fun Int.floorMod(other: Int): Int = kotlinMod(other)
+actual infix fun Long.floorMod(other: Int): Int = kotlinMod(other)
 
-    return if (this xor other < 0 && result * other != this) {
-        result - 1
-    } else {
-        result
-    }
-}
-
-actual infix fun Int.floorDiv(other: Int): Int {
-    val result = this / other
-
-    return if (this xor other < 0 && result * other != this) {
-        result - 1
-    } else {
-        result
-    }
-}
-
-actual infix fun Long.floorDiv(other: Int): Long = this floorDiv other.toLong()
+actual infix fun Long.floorDiv(other: Long): Long = kotlinFloorDiv(other)
+actual infix fun Int.floorDiv(other: Int): Int = kotlinFloorDiv(other)
+actual infix fun Long.floorDiv(other: Int): Long = kotlinFloorDiv(other)
 
 actual infix fun Long.plusExact(other: Long): Long {
     val result = this + other