MPP, Maven: remove mpp test from maven plugin
The MPP should be removed from the maven plugin soon, and since this test fails on K2 anyway, it was decided to remove it. related to #KT-61285
This commit is contained in:
Ilya Chernikov
committed by
Space Team
Space Team
parent
afd7186680
commit
063f81ed36
@@ -211,8 +211,6 @@
|
||||
<pomExclude>test-enable-extensions/pom.xml</pomExclude>
|
||||
<pomExclude>test-kapt-allopen/pom.xml</pomExclude>
|
||||
<pomExclude>test-lombok-with-kapt/pom.xml</pomExclude>
|
||||
<!-- exclude mpp -->
|
||||
<pomExclude>test-multiplatform/pom.xml</pomExclude>
|
||||
<!-- exclude kts -->
|
||||
<pomExclude>test-helloworld-kts/pom.xml</pomExclude>
|
||||
<!-- exclude test, that depends on lv as they will be automatically fixed, when current lv goes to 2.0 -->
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>test-multimodule-root</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>test-multimodule-jvm</artifactId>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-stdlib</artifactId>
|
||||
<version>${kotlin.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>test-multimodule-shared</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-test-junit</artifactId>
|
||||
<version>${kotlin.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.13.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
|
||||
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
|
||||
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>kotlin-maven-plugin</artifactId>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<version>${kotlin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>compile</id>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>compile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<multiPlatform>true</multiPlatform>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>compile-test</id>
|
||||
<phase>test-compile</phase>
|
||||
<goals>
|
||||
<goal>test-compile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<multiPlatform>true</multiPlatform>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
-9
@@ -1,9 +0,0 @@
|
||||
package org.jetbrains
|
||||
|
||||
fun main(args : Array<String>) {
|
||||
doMain()
|
||||
}
|
||||
|
||||
actual fun doMain() {
|
||||
System.out?.println(getGreeting())
|
||||
}
|
||||
-10
@@ -1,10 +0,0 @@
|
||||
package org.jetbrains
|
||||
|
||||
import org.junit.*
|
||||
|
||||
class JVMSpecificTest {
|
||||
@Test
|
||||
fun test1() {
|
||||
Assert.assertEquals(1, 1)
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>test-multimodule-root</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>shared</module>
|
||||
<module>jvm</module>
|
||||
</modules>
|
||||
</project>
|
||||
@@ -1,64 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>test-multimodule-root</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>test-multimodule-shared</artifactId>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-stdlib-common</artifactId>
|
||||
<version>${kotlin.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-test-common</artifactId>
|
||||
<version>${kotlin.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-test-annotations-common</artifactId>
|
||||
<version>${kotlin.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
|
||||
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
|
||||
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>kotlin-maven-plugin</artifactId>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<version>${kotlin.version}</version>
|
||||
|
||||
<executions>
|
||||
<execution>
|
||||
<id>metadata</id>
|
||||
<goals>
|
||||
<goal>metadata</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>test-metadata</id>
|
||||
<goals>
|
||||
<goal>test-metadata</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
-7
@@ -1,7 +0,0 @@
|
||||
package org.jetbrains
|
||||
|
||||
expect fun doMain()
|
||||
|
||||
fun getGreeting() : String {
|
||||
return "Hello, World!"
|
||||
}
|
||||
-10
@@ -1,10 +0,0 @@
|
||||
package org.jetbrains
|
||||
|
||||
import kotlin.test.*
|
||||
|
||||
open class SharedTest {
|
||||
@Test
|
||||
fun test0() {
|
||||
assertEquals("Hello, World!", getGreeting())
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
Reference in New Issue
Block a user