Fixes for native

vorpal-research · Oct 2, 2020 · 01b7e68 · 01b7e68
1 parent 1910862
commit 01b7e68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -94,6 +94,12 @@ kotlin {
                 api(kotlin("test-js"))
             }
         }
+        val linuxX64Main by getting {
+            dependsOn(commonMain)
+        }
+        val linuxX64Test by getting {
+            dependsOn(linuxX64Main)
+        }
     }
 }
 

diff --git a/src/commonMain/kotlin/ru/spbstu/wheels/Ranges.kt b/src/commonMain/kotlin/ru/spbstu/wheels/Ranges.kt
@@ -21,7 +21,7 @@ inline operator fun PositiveInfinity.unaryPlus() = PositiveInfinity
 @Suppress(Warnings.NOTHING_TO_INLINE)
 inline operator fun NegativeInfinity.unaryPlus() = NegativeInfinity
 
-val Inf = PositiveInfinity
+val Inf get() = PositiveInfinity
 
 operator fun NegativeInfinity.rangeTo(inf: PositiveInfinity) = UniversalRange
 

diff --git a/src/commonTest/kotlin/ru/spbstu/wheels/MapsTest.kt b/src/commonTest/kotlin/ru/spbstu/wheels/MapsTest.kt
@@ -8,8 +8,10 @@ class MapsTest {
     fun simpleEntry() {
         val map = ('a'..'z').withIndex().map { (i, c) -> "$c" to i }.toMap()
 
-        assertTrue(SimpleEntry("h", 7) in map.entries)
-        assertFalse(SimpleEntry("a", 5) in map.entries)
+        // contains for map.entries works weirdly on native, see
+        // https://youtrack.jetbrains.com/issue/KT-42428
+        assertTrue(SimpleEntry("h", 7) in map.entries.toSet())
+        assertFalse(SimpleEntry("a", 5) in map.entries.toSet())
 
         val actualEntry = map.entries.find { it.key == "h" }
         val ourEntry = SimpleEntry("h", 7)