plugins to mpp

kotest · Aug 16, 2019 · d04c46a · d04c46a
1 parent d55c55a
commit d04c46a
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 9 deletions.
diff --git a/kotlintest-plugins/kotlintest-plugins-pitest/build.gradle b/kotlintest-plugins/kotlintest-plugins-pitest/build.gradle
@@ -1,15 +1,39 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm'
+    id 'org.jetbrains.kotlin.multiplatform'
     id 'java-library'
-    id 'maven-publish'
-    id 'signing'
 }
 
-dependencies {
-    compile project(':kotlintest-runner:kotlintest-runner-jvm')
-    compile 'org.pitest:pitest:1.4.5'
-    testCompile project(":kotlintest-runner:kotlintest-runner-junit5")
+repositories {
+    mavenCentral()
+}
+
+kotlin {
+
+    jvm()
+
+    sourceSets {
+
+        jvmMain {
+            dependencies {
+                implementation kotlin('stdlib-jdk8')
+                implementation project(':kotlintest-runner:kotlintest-runner-jvm')
+                implementation 'org.pitest:pitest:1.4.5'
+            }
+        }
+
+        jvmTest {
+            dependencies {
+                implementation project(':kotlintest-runner:kotlintest-runner-junit5')
+            }
+        }
+    }
+}
+
+compileKotlinJvm {
+    kotlinOptions {
+        freeCompilerArgs += '-Xuse-experimental=kotlin.Experimental'
+    }
 }
 
 test {
@@ -19,4 +43,4 @@ test {
     }
 }
 
-apply from: '../../publish.gradle'
+apply from: '../../publish.gradle'
diff --git a/.../plugin/pitest/KotlinTestConfiguration.kt → .../plugin/pitest/KotlinTestConfiguration.kt b/.../plugin/pitest/KotlinTestConfiguration.kt → .../plugin/pitest/KotlinTestConfiguration.kt
diff --git a/.../plugin/pitest/KotlinTestPluginFactory.kt → .../plugin/pitest/KotlinTestPluginFactory.kt b/.../plugin/pitest/KotlinTestPluginFactory.kt → .../plugin/pitest/KotlinTestPluginFactory.kt
diff --git a/...st/plugin/pitest/KotlinTestSuiteFinder.kt → ...st/plugin/pitest/KotlinTestSuiteFinder.kt b/...st/plugin/pitest/KotlinTestSuiteFinder.kt → ...st/plugin/pitest/KotlinTestSuiteFinder.kt
diff --git a/...otlintest/plugin/pitest/KotlinTestUnit.kt → ...otlintest/plugin/pitest/KotlinTestUnit.kt b/...otlintest/plugin/pitest/KotlinTestUnit.kt → ...otlintest/plugin/pitest/KotlinTestUnit.kt
diff --git a/...est/plugin/pitest/KotlinTestUnitFinder.kt → ...est/plugin/pitest/KotlinTestUnitFinder.kt b/...est/plugin/pitest/KotlinTestUnitFinder.kt → ...est/plugin/pitest/KotlinTestUnitFinder.kt
diff --git a/...ices/org.pitest.testapi.TestPluginFactory → ...ices/org.pitest.testapi.TestPluginFactory b/...ices/org.pitest.testapi.TestPluginFactory → ...ices/org.pitest.testapi.TestPluginFactory
diff --git a/...ntest/plugin/pitest/KotlinTestUnitTest.kt → ...ntest/plugin/pitest/KotlinTestUnitTest.kt b/...ntest/plugin/pitest/KotlinTestUnitTest.kt → ...ntest/plugin/pitest/KotlinTestUnitTest.kt
diff --git a/...test/plugin/pitest/TestResultCollector.kt → ...test/plugin/pitest/TestResultCollector.kt b/...test/plugin/pitest/TestResultCollector.kt → ...test/plugin/pitest/TestResultCollector.kt
diff --git a/...otlintest/plugin/pitest/specs/FunSpecs.kt → ...otlintest/plugin/pitest/specs/FunSpecs.kt b/...otlintest/plugin/pitest/specs/FunSpecs.kt → ...otlintest/plugin/pitest/specs/FunSpecs.kt
diff --git a/...intest/plugin/pitest/specs/StringSpecs.kt → ...intest/plugin/pitest/specs/StringSpecs.kt b/...intest/plugin/pitest/specs/StringSpecs.kt → ...intest/plugin/pitest/specs/StringSpecs.kt
diff --git a/...tlintest/plugin/pitest/specs/WordSpecs.kt → ...tlintest/plugin/pitest/specs/WordSpecs.kt b/...tlintest/plugin/pitest/specs/WordSpecs.kt → ...tlintest/plugin/pitest/specs/WordSpecs.kt
diff --git a/...n/io/kotlintest/provided/ProjectConfig.kt → ...n/io/kotlintest/provided/ProjectConfig.kt b/...n/io/kotlintest/provided/ProjectConfig.kt → ...n/io/kotlintest/provided/ProjectConfig.kt
diff --git a/kotlintest-runner/kotlintest-runner-junit4/build.gradle b/kotlintest-runner/kotlintest-runner-junit4/build.gradle
@@ -17,6 +17,7 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
+                implementation project(':kotlintest-core')
                 implementation project(':kotlintest-runner:kotlintest-runner-jvm')
                 implementation 'junit:junit:4.12'
                 implementation 'net.sourceforge.argparse4j:argparse4j:0.8.1'

diff --git a/kotlintest-runner/kotlintest-runner-jvm/build.gradle b/kotlintest-runner/kotlintest-runner-jvm/build.gradle
@@ -29,7 +29,6 @@ kotlin {
 
         jvmTest {
             dependencies {
-                implementation kotlin('stdlib-jdk8')
                 implementation project(':kotlintest-runner:kotlintest-runner-junit5')
             }
         }