Fix build

arrow-kt · Oct 24, 2023 · 64be78e · 64be78e
1 parent bda6806
commit 64be78e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 25 deletions.
diff --git a/arrow-libs/core/arrow-annotations/build.gradle.kts b/arrow-libs/core/arrow-annotations/build.gradle.kts
@@ -13,6 +13,8 @@ spotless {
   }
 }
 
+apply(from = property("ANIMALSNIFFER_MPP"))
+
 kotlin {
   sourceSets {
     commonMain {
@@ -25,11 +27,6 @@ kotlin {
         implementation(libs.kotlin.stdlib)
       }
     }
-    jvmTest {
-      dependencies {
-        runtimeOnly(libs.kotest.runnerJUnit5)
-      }
-    }
     jsMain {
       dependencies {
         implementation(libs.kotlin.stdlibJS)
@@ -45,5 +42,3 @@ kotlin {
     }
   }
 }
-
-apply(from = property("ANIMALSNIFFER_MPP"))
diff --git a/arrow-libs/core/arrow-atomic/build.gradle.kts b/arrow-libs/core/arrow-atomic/build.gradle.kts
@@ -2,12 +2,10 @@
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-
 plugins {
   id(libs.plugins.kotlin.multiplatform.get().pluginId)
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
-
   alias(libs.plugins.kotlinx.kover)
   alias(libs.plugins.spotless)
 }
@@ -34,6 +32,7 @@ kotlin {
         implementation(libs.kotlin.test)
         implementation(libs.kotest.assertionsCore)
         implementation(libs.kotest.property)
+        implementation(libs.coroutines.test)
       }
     }
 
@@ -48,21 +47,6 @@ kotlin {
         implementation(libs.kotlin.stdlibJS)
       }
     }
-
-    commonTest {
-      dependencies {
-        implementation(projects.arrowFxCoroutines)
-        implementation(libs.kotest.frameworkEngine)
-        implementation(libs.kotest.assertionsCore)
-        implementation(libs.kotest.property)
-      }
-    }
-
-    jvmTest {
-      dependencies {
-        runtimeOnly(libs.kotest.runnerJUnit5)
-      }
-    }
   }
 
   jvm {

diff --git a/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts b/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts
@@ -28,12 +28,14 @@ kotlin {
 
     commonTest {
       dependencies {
+        implementation(libs.kotlin.test)
         implementation(libs.kotest.frameworkEngine)
         implementation(libs.kotest.assertionsCore)
         implementation(libs.kotest.property)
         implementation(libs.coroutines.test)
       }
     }
+
     jvmTest {
       dependencies {
         runtimeOnly(libs.kotest.runnerJUnit5)
@@ -45,6 +47,7 @@ kotlin {
         implementation(libs.kotlin.stdlib)
       }
     }
+
     jsMain {
       dependencies {
         implementation(libs.kotlin.stdlibJS)

diff --git a/arrow-libs/fx/arrow-fx-coroutines/src/commonTest/kotlin/arrow/fx/coroutines/ParMapTest.kt b/arrow-libs/fx/arrow-fx-coroutines/src/commonTest/kotlin/arrow/fx/coroutines/ParMapTest.kt
@@ -4,17 +4,19 @@ import arrow.atomic.AtomicInt
 import arrow.atomic.update
 import arrow.core.Either
 import arrow.core.NonEmptyList
-import arrow.core.continuations.either
 import arrow.core.left
+import arrow.core.raise.either
 import io.kotest.matchers.should
 import io.kotest.matchers.shouldBe
 import io.kotest.property.Arb
 import io.kotest.property.arbitrary.int
 import io.kotest.property.arbitrary.string
 import io.kotest.property.checkAll
+import kotlin.test.Test
 import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.withTimeoutOrNull
+import kotlinx.coroutines.test.runTest
 
 class ParMapTest {
   @Test fun parMapIsStackSafe() = runTest {