azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Maven: never generate JUnit (but keep code so we will be able to introduce checkbox in configurator to optionally add junit and chose version)

Browse Source
This commit is contained in:
Sergey Mashkov
2016-04-01 19:51:06 +03:00
parent c30fc78f8e
commit b8327f19b8
6 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java
+2 -2
View File
@@ -25,11 +25,11 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
public class KotlinJavaMavenConfigurator extends KotlinMavenConfigurator {
private static final String NAME = "maven";
public static final String STD_LIB_ID = "kotlin-stdlib";
private static final String TEST_LIB_ID = "kotlin-test-junit";
public static final String TEST_LIB_ID = "kotlin-test";
private static final String PRESENTABLE_TEXT = "Maven";
public KotlinJavaMavenConfigurator() {
super(STD_LIB_ID, TEST_LIB_ID, true, NAME, PRESENTABLE_TEXT);
super(STD_LIB_ID, TEST_LIB_ID, false, NAME, PRESENTABLE_TEXT);
}
@Override
idea/idea-maven/testData/configurator/jvm/fixExisting/pom_after.xml
Vendored
+1 -7
View File
@@ -18,16 +18,10 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
idea/idea-maven/testData/configurator/jvm/libraryMissed/pom_after.xml
Vendored
+1 -7
View File
@@ -45,16 +45,10 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
idea/idea-maven/testData/configurator/jvm/pluginMissed/pom_after.xml
Vendored
+1 -7
View File
@@ -18,16 +18,10 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
idea/idea-maven/testData/configurator/jvm/simpleProject/pom_after.xml
Vendored
+1 -7
View File
@@ -20,16 +20,10 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml
Vendored
+1 -7
View File
@@ -20,16 +20,10 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
<repositories>