Update all Gradle files to mention kotlin.test

arrow-kt · Oct 25, 2023 · 6a44225 · 6a44225
1 parent e75d31e
commit 6a44225
Show file tree

Hide file tree

Showing 19 changed files with 88 additions and 129 deletions.
diff --git a/arrow-libs/core/arrow-annotations/build.gradle.kts b/arrow-libs/core/arrow-annotations/build.gradle.kts
@@ -18,20 +18,10 @@ apply(from = property("ANIMALSNIFFER_MPP"))
 kotlin {
   sourceSets {
     commonMain {
-      dependencies {
-        implementation(libs.kotlin.stdlibCommon)
-      }
-    }
-    jvmMain {
       dependencies {
         implementation(libs.kotlin.stdlib)
       }
     }
-    jsMain {
-      dependencies {
-        implementation(libs.kotlin.stdlibJS)
-      }
-    }
   }
 
   jvm {

diff --git a/arrow-libs/core/arrow-atomic/build.gradle.kts b/arrow-libs/core/arrow-atomic/build.gradle.kts
@@ -22,29 +22,17 @@ kotlin {
   sourceSets {
     commonMain {
       dependencies {
-        api(libs.kotlin.stdlibCommon)
+        api(libs.kotlin.stdlib)
       }
     }
 
     commonTest {
       dependencies {
         implementation(projects.arrowFxCoroutines)
         implementation(libs.kotlin.test)
+        implementation(libs.coroutines.test)
         implementation(libs.kotest.assertionsCore)
         implementation(libs.kotest.property)
-        implementation(libs.coroutines.test)
-      }
-    }
-
-    jvmMain {
-      dependencies {
-        implementation(libs.kotlin.stdlib)
-      }
-    }
-
-    jsMain {
-      dependencies {
-        implementation(libs.kotlin.stdlibJS)
       }
     }
   }
@@ -63,3 +51,7 @@ tasks.withType<KotlinCompile>().configureEach {
     freeCompilerArgs = freeCompilerArgs + "-Xexpect-actual-classes"
   }
 }
+
+tasks.withType<Test> {
+  useJUnitPlatform()
+}
diff --git a/arrow-libs/core/arrow-core-retrofit/build.gradle.kts b/arrow-libs/core/arrow-core-retrofit/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
   id(libs.plugins.kotlin.jvm.get().pluginId)
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
-
   alias(libs.plugins.kotlinx.serialization) // Needed for testing only
   alias(libs.plugins.kotlinx.kover)
   alias(libs.plugins.spotless)
@@ -24,6 +23,8 @@ dependencies {
   compileOnly(libs.squareup.retrofit)
 
   testImplementation(projects.arrowCore)
+  testImplementation(libs.kotlin.test)
+  testImplementation(libs.coroutines.test)
   testImplementation(libs.kotest.frameworkEngine)
   testImplementation(libs.kotest.assertionsCore)
   testImplementation(libs.kotest.property)
@@ -41,3 +42,7 @@ tasks.jar {
     attributes["Automatic-Module-Name"] = "arrow.core.retrofit"
   }
 }
+
+tasks.withType<Test> {
+  useJUnitPlatform()
+}
diff --git a/arrow-libs/core/arrow-core-serialization/build.gradle.kts b/arrow-libs/core/arrow-core-serialization/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
   id(libs.plugins.kotlin.multiplatform.get().pluginId)
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
-
   alias(libs.plugins.kotest.multiplatform)
   id(libs.plugins.kotlinx.serialization.get().pluginId)
 }
@@ -16,14 +15,16 @@ kotlin {
     commonMain {
       dependencies {
         api(projects.arrowCore)
-        api(libs.kotlin.stdlibCommon)
+        api(libs.kotlin.stdlib)
         api(libs.kotlinx.serializationCore)
       }
     }
 
     commonTest {
       dependencies {
         implementation(libs.kotlinx.serializationJson)
+        implementation(libs.kotlin.test)
+        implementation(libs.coroutines.test)
         implementation(libs.kotest.frameworkEngine)
         implementation(libs.kotest.assertionsCore)
         implementation(libs.kotest.property)
@@ -45,3 +46,7 @@ kotlin {
     }
   }
 }
+
+tasks.withType<Test> {
+  useJUnitPlatform()
+}
diff --git a/arrow-libs/core/arrow-core/build.gradle.kts b/arrow-libs/core/arrow-core/build.gradle.kts
@@ -25,37 +25,27 @@ kotlin {
       dependencies {
         api(projects.arrowAtomic)
         api(projects.arrowAnnotations)
-        api(libs.kotlin.stdlibCommon)
+        api(libs.kotlin.stdlib)
       }
     }
 
     commonTest {
       dependencies {
         implementation(projects.arrowFxCoroutines)
         implementation(projects.arrowFunctions)
-          implementation(libs.kotest.frameworkEngine)
-          implementation(libs.kotest.assertionsCore)
-          implementation(libs.kotest.property)
-        }
+        implementation(libs.kotlin.test)
+        implementation(libs.coroutines.test)
+        implementation(libs.kotest.frameworkEngine)
+        implementation(libs.kotest.assertionsCore)
+        implementation(libs.kotest.property)
       }
+    }
 
     jvmTest {
       dependencies {
         runtimeOnly(libs.kotest.runnerJUnit5)
       }
     }
-
-    jvmMain {
-      dependencies {
-        implementation(libs.kotlin.stdlib)
-      }
-    }
-
-    jsMain {
-      dependencies {
-        implementation(libs.kotlin.stdlibJS)
-      }
-    }
   }
 
   jvm {
@@ -71,3 +61,7 @@ kotlin {
 tasks.named<KotlinCompile>("compileTestKotlinJvm") {
   kotlinOptions.freeCompilerArgs += "-Xcontext-receivers"
 }
+
+tasks.withType<Test> {
+  useJUnitPlatform()
+}
diff --git a/arrow-libs/core/arrow-functions/build.gradle.kts b/arrow-libs/core/arrow-functions/build.gradle.kts
@@ -26,35 +26,25 @@ kotlin {
       dependencies {
         api(projects.arrowAtomic)
         api(projects.arrowAnnotations)
-        api(libs.kotlin.stdlibCommon)
+        api(libs.kotlin.stdlib)
       }
     }
     commonTest {
       dependencies {
         implementation(projects.arrowFxCoroutines)
-          implementation(libs.kotest.frameworkEngine)
-          implementation(libs.kotest.assertionsCore)
-          implementation(libs.kotest.property)
-        }
+        implementation(libs.kotlin.test)
+        implementation(libs.coroutines.test)
+        implementation(libs.kotest.frameworkEngine)
+        implementation(libs.kotest.assertionsCore)
+        implementation(libs.kotest.property)
       }
+    }
 
     jvmTest {
       dependencies {
         runtimeOnly(libs.kotest.runnerJUnit5)
       }
     }
-
-    jvmMain {
-      dependencies {
-        implementation(libs.kotlin.stdlib)
-      }
-    }
-
-    jsMain {
-      dependencies {
-        implementation(libs.kotlin.stdlibJS)
-      }
-    }
   }
 
   jvm {
@@ -65,3 +55,7 @@ kotlin {
     }
   }
 }
+
+tasks.withType<Test> {
+  useJUnitPlatform()
+}
diff --git a/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts b/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts
@@ -22,30 +22,18 @@ kotlin {
       dependencies {
         api(projects.arrowCore)
         api(libs.coroutines.core)
-        implementation(libs.kotlin.stdlibCommon)
+        implementation(libs.kotlin.stdlib)
       }
     }
 
     commonTest {
       dependencies {
         implementation(projects.arrowCore)
         implementation(libs.kotlin.test)
+        implementation(libs.coroutines.test)
         implementation(libs.kotest.frameworkEngine)
         implementation(libs.kotest.assertionsCore)
         implementation(libs.kotest.property)
-        implementation(libs.coroutines.test)
-      }
-    }
-
-    jvmMain {
-      dependencies {
-        implementation(libs.kotlin.stdlib)
-      }
-    }
-
-    jsMain {
-      dependencies {
-        implementation(libs.kotlin.stdlibJS)
       }
     }
   }
@@ -58,3 +46,7 @@ kotlin {
     }
   }
 }
+
+tasks.withType<Test> {
+  useJUnitPlatform()
+}
diff --git a/arrow-libs/fx/arrow-fx-stm/build.gradle.kts b/arrow-libs/fx/arrow-fx-stm/build.gradle.kts
@@ -28,10 +28,10 @@ kotlin {
     commonTest {
       dependencies {
         implementation(projects.arrowFxCoroutines)
-        implementation(libs.kotest.assertionsCore)
-        implementation(libs.kotest.property)
         implementation(libs.kotlin.test)
         implementation(libs.coroutines.test)
+        implementation(libs.kotest.assertionsCore)
+        implementation(libs.kotest.property)
       }
     }
   }

diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts b/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts
@@ -24,8 +24,7 @@ dependencies {
   implementation(libs.ksp)
 
   testImplementation(libs.kotlin.stdlib)
-  testImplementation(libs.junitJupiter)
-  testImplementation(libs.junitJupiterEngine)
+  testImplementation(libs.kotlin.test)
   testImplementation(libs.assertj)
   testImplementation(libs.classgraph)
   testImplementation(libs.kotlinCompileTesting) {
@@ -45,8 +44,7 @@ dependencies {
   testRuntimeOnly(projects.arrowOptics)
 }
 
-tasks {
-  withType<Test>().configureEach {
-    maxParallelForks = 1
-  }
+tasks.withType<Test> {
+  maxParallelForks = 1
+  useJUnitPlatform()
 }
diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/CopyTest.kt b/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/CopyTest.kt
@@ -1,6 +1,6 @@
 package arrow.optics.plugin
 
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
 
 // from https://kotlinlang.slack.com/archives/C5UPMM0A0/p1688822411819599
 // and https://github.com/overfullstack/my-lab/blob/master/arrow/src/test/kotlin/ga/overfullstack/optics/OpticsLab.kt

diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/DSLTests.kt b/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/DSLTests.kt
@@ -1,6 +1,6 @@
 package arrow.optics.plugin
 
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
 
 class DSLTests {
 

diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/IsoTests.kt b/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/IsoTests.kt
@@ -1,7 +1,7 @@
 package arrow.optics.plugin
 
 import arrow.optics.plugin.internals.noCompanion
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
 
 class IsoTests {
 

diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/LensTests.kt b/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/LensTests.kt
@@ -1,6 +1,6 @@
 package arrow.optics.plugin
 
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
 
 class LensTests {
 

diff --git a/...-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/OptionalTests.kt b/...-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/OptionalTests.kt
@@ -1,6 +1,6 @@
 package arrow.optics.plugin
 
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
 
 class OptionalTests {
 

diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/PrismTests.kt b/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/PrismTests.kt
@@ -1,6 +1,6 @@
 package arrow.optics.plugin
 
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
 
 class PrismTests {
 

diff --git a/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts b/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts
@@ -23,17 +23,19 @@ dependencies {
   implementation(libs.kotlin.stdlib)
 
   testImplementation(libs.kotlin.stdlib)
-  testImplementation(libs.junitJupiterEngine)
+  testImplementation(libs.kotlin.test)
+  testImplementation(libs.coroutines.test)
   testImplementation(libs.kotlin.reflect)
-
-  testImplementation(libs.kotest.frameworkEngine)
   testImplementation(libs.kotest.assertionsCore)
   testImplementation(libs.kotest.property)
-  testRuntimeOnly(libs.kotest.runnerJUnit5)
 }
 
 tasks.jar {
   manifest {
     attributes["Automatic-Module-Name"] = "arrow.optics.reflect"
   }
 }
+
+tasks.withType<Test> {
+  useJUnitPlatform()
+}