diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index ae25ae60157..92f563c4557 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -211,8 +211,6 @@ test-enable-extensions/pom.xml test-kapt-allopen/pom.xml test-lombok-with-kapt/pom.xml - - test-multiplatform/pom.xml test-helloworld-kts/pom.xml diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/pom.xml deleted file mode 100644 index 6256eaf6c7c..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - - - org.jetbrains.kotlin - test-multimodule-root - 1.0-SNAPSHOT - ../pom.xml - - - test-multimodule-jvm - - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - org.jetbrains.kotlin - test-multimodule-shared - ${project.version} - - - org.jetbrains.kotlin - kotlin-test-junit - ${kotlin.version} - test - - - junit - junit - 4.13.1 - test - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - compile - compile - - compile - - - true - - - - compile-test - test-compile - - test-compile - - - true - - - - - - - - diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/main/kotlin/org/jetbrains/HelloWorld.kt deleted file mode 100644 index 6af2f0341d2..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.jetbrains - -fun main(args : Array) { - doMain() -} - -actual fun doMain() { - System.out?.println(getGreeting()) -} \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/test/kotlin/org/jetbrains/JVMSpecificTest.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/test/kotlin/org/jetbrains/JVMSpecificTest.kt deleted file mode 100644 index e7efd9f896e..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/jvm/src/test/kotlin/org/jetbrains/JVMSpecificTest.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.jetbrains - -import org.junit.* - -class JVMSpecificTest { - @Test - fun test1() { - Assert.assertEquals(1, 1) - } -} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/pom.xml deleted file mode 100644 index 9f483785859..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.jetbrains.kotlin - test-multimodule-root - 1.0-SNAPSHOT - pom - - - shared - jvm - - diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/pom.xml deleted file mode 100644 index cc86dad18d3..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - 4.0.0 - - - org.jetbrains.kotlin - test-multimodule-root - 1.0-SNAPSHOT - ../pom.xml - - - test-multimodule-shared - - - - org.jetbrains.kotlin - kotlin-stdlib-common - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-test-common - ${kotlin.version} - test - - - org.jetbrains.kotlin - kotlin-test-annotations-common - ${kotlin.version} - test - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - - metadata - - metadata - - - - test-metadata - - test-metadata - - - - - - - - diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/main/kotlin/org/jetbrains/api.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/main/kotlin/org/jetbrains/api.kt deleted file mode 100644 index 5d9dcf70a38..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/main/kotlin/org/jetbrains/api.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.jetbrains - -expect fun doMain() - -fun getGreeting() : String { - return "Hello, World!" -} \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/jetbrains/SharedTest.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/jetbrains/SharedTest.kt deleted file mode 100644 index 1623b9fbfed..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/shared/src/test/kotlin/org/jetbrains/SharedTest.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.jetbrains - -import kotlin.test.* - -open class SharedTest { - @Test - fun test0() { - assertEquals("Hello, World!", getGreeting()) - } -} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/verify.bsh deleted file mode 100644 index 730875e27d2..00000000000 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-multiplatform/verify.bsh +++ /dev/null @@ -1,18 +0,0 @@ -source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); - -assertBuildLogHasLineThatContains("kotlin-maven-plugin"); - -File classFile = new File(basedir, "jvm/target/classes/org/jetbrains/HelloWorldKt.class"); -if (!classFile.exists()) { - throw new FileNotFoundException("Could not find generated class file: " + classFile); -} - -classFile = new File(basedir, "jvm/target/classes/org/jetbrains/ApiKt.class"); -if (!classFile.exists()) { - throw new FileNotFoundException("Could not find generated class file: " + classFile); -} - -File metaFile = new File(basedir, "shared/target/classes/org/jetbrains/ApiKt.kotlin_metadata"); -if (!metaFile.exists()) { - throw new FileNotFoundException("Could not find generated common metadata file: " + metaFile); -}