diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt index c7fa939079d..58be94958fa 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt @@ -34,6 +34,7 @@ import org.jetbrains.idea.maven.dom.model.* import org.jetbrains.idea.maven.model.MavenId import org.jetbrains.idea.maven.utils.MavenArtifactScope import org.jetbrains.jps.model.java.JavaSourceRootType +import org.jetbrains.kotlin.idea.configuration.RepositoryDescription import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType import java.util.* @@ -225,12 +226,20 @@ class PomFile(val xmlFile: XmlFile) { return addRepository(id, name, url, snapshots, releases, { domModel.pluginRepositories.pluginRepositories }, { domModel.pluginRepositories.addPluginRepository() }) } + fun addPluginRepository(description: RepositoryDescription) { + addPluginRepository(description.id, description.name, description.url, description.isSnapshot, true) + } + fun addLibraryRepository(id: String, name: String, url: String, snapshots: Boolean = false, releases: Boolean = true): MavenDomRepository { ensureRepositories() return addRepository(id, name, url, snapshots, releases, { domModel.repositories.repositories }, { domModel.repositories.addRepository() }) } + fun addLibraryRepository(description: RepositoryDescription) { + addLibraryRepository(description.id, description.name, description.url, description.isSnapshot, true) + } + private fun addRepository(id: String, name: String, url: String, snapshots: Boolean, releases: Boolean, existing: () -> List, create: () -> MavenDomRepository): MavenDomRepository { val repository = diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.kt index 258efa9522a..6a00bc60855 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform class KotlinJavaMavenConfigurator : KotlinMavenConfigurator(KotlinJavaMavenConfigurator.STD_LIB_ID, KotlinJavaMavenConfigurator.TEST_LIB_ID, false, KotlinJavaMavenConfigurator.NAME, KotlinJavaMavenConfigurator.PRESENTABLE_TEXT) { override fun isKotlinModule(module: Module): Boolean { - return hasKotlinRuntimeInScope(module) + return hasKotlinJvmRuntimeInScope(module) } override fun isRelevantGoal(goalName: String): Boolean { diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavascriptMavenConfigurator.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavascriptMavenConfigurator.kt index f5b3fc12b85..162ba906d04 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavascriptMavenConfigurator.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavascriptMavenConfigurator.kt @@ -18,15 +18,15 @@ package org.jetbrains.kotlin.idea.maven.configuration import com.intellij.openapi.module.Module import org.jetbrains.idea.maven.dom.model.MavenDomPlugin +import org.jetbrains.kotlin.idea.configuration.hasKotlinJsRuntimeInScope import org.jetbrains.kotlin.idea.maven.PomFile -import org.jetbrains.kotlin.idea.project.ProjectStructureUtil import org.jetbrains.kotlin.js.resolve.JsPlatform import org.jetbrains.kotlin.resolve.TargetPlatform class KotlinJavascriptMavenConfigurator : KotlinMavenConfigurator(KotlinJavascriptMavenConfigurator.STD_LIB_ID, null, false, KotlinJavascriptMavenConfigurator.NAME, KotlinJavascriptMavenConfigurator.PRESENTABLE_TEXT) { override fun isKotlinModule(module: Module): Boolean { - return ProjectStructureUtil.isJsKotlinModule(module) + return hasKotlinJsRuntimeInScope(module) } override fun isRelevantGoal(goalName: String): Boolean { @@ -35,7 +35,7 @@ class KotlinJavascriptMavenConfigurator : KotlinMavenConfigurator(KotlinJavascri override fun createExecutions(pomFile: PomFile, kotlinPlugin: MavenDomPlugin, module: Module) { createExecution(pomFile, kotlinPlugin, PomFile.DefaultPhases.Compile, PomFile.KotlinGoals.Js, module, false) - createExecution(pomFile, kotlinPlugin, PomFile.DefaultPhases.Compile, PomFile.KotlinGoals.TestJs, module, true) + createExecution(pomFile, kotlinPlugin, PomFile.DefaultPhases.TestCompile, PomFile.KotlinGoals.TestJs, module, true) } override fun getTargetPlatform(): TargetPlatform { diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt index 3fa097833d5..632879666aa 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt @@ -36,9 +36,7 @@ import org.jetbrains.idea.maven.model.MavenId import org.jetbrains.idea.maven.project.MavenProjectsManager import org.jetbrains.idea.maven.utils.MavenArtifactScope import org.jetbrains.kotlin.idea.KotlinPluginUtil -import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator -import org.jetbrains.kotlin.idea.configuration.NotificationMessageCollector -import org.jetbrains.kotlin.idea.configuration.createConfigureKotlinNotificationCollector +import org.jetbrains.kotlin.idea.configuration.* import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion import org.jetbrains.kotlin.idea.maven.PomFile import org.jetbrains.kotlin.idea.maven.excludeMavenChildrenModules @@ -123,12 +121,17 @@ abstract class KotlinMavenConfigurator protected constructor(private val stdlibA pom.addDependency(MavenId(GROUP_ID, testArtifactId, "\${$KOTLIN_VERSION_PROPERTY}"), MavenArtifactScope.TEST, null, false, null) } if (addJunit) { + // TODO currently it is always disabled: junit version selection could be shown in the configurator dialog pom.addDependency(MavenId("junit", "junit", "4.12"), MavenArtifactScope.TEST, null, false, null) } if (isSnapshot(version)) { - pom.addLibraryRepository(SNAPSHOT_REPOSITORY_ID, SONATYPE_OSS_REPOSITORY_NAME, SONATYPE_OSS_REPOSITORY_URL, true, false) - pom.addPluginRepository(SNAPSHOT_REPOSITORY_ID, SONATYPE_OSS_REPOSITORY_NAME, SONATYPE_OSS_REPOSITORY_URL, true, false) + pom.addLibraryRepository(SNAPSHOT_REPOSITORY) + pom.addPluginRepository(SNAPSHOT_REPOSITORY) + } + if (isEap(version)) { + pom.addLibraryRepository(EAP_REPOSITORY) + pom.addPluginRepository(EAP_REPOSITORY) } val plugin = pom.addPlugin(MavenId(GROUP_ID, MAVEN_PLUGIN_ID, "\${$KOTLIN_VERSION_PROPERTY}")) @@ -156,9 +159,6 @@ abstract class KotlinMavenConfigurator protected constructor(private val stdlibA val GROUP_ID = "org.jetbrains.kotlin" val MAVEN_PLUGIN_ID = "kotlin-maven-plugin" private val KOTLIN_VERSION_PROPERTY = "kotlin.version" - private val SNAPSHOT_REPOSITORY_ID = "sonatype.oss.snapshots" - private val SONATYPE_OSS_REPOSITORY_NAME = "Sonatype OSS Snapshot Repository" - private val SONATYPE_OSS_REPOSITORY_URL = "http://oss.sonatype.org/content/repositories/snapshots" private fun hasJavaFiles(module: Module): Boolean { return !FileTypeIndex.getFiles(JavaFileType.INSTANCE, GlobalSearchScope.moduleScope(module)).isEmpty() @@ -176,10 +176,6 @@ abstract class KotlinMavenConfigurator protected constructor(private val stdlibA return null } - private fun isSnapshot(version: String): Boolean { - return version.contains("SNAPSHOT") - } - private fun canConfigureFile(file: PsiFile): Boolean { return WritingAccessProvider.isPotentiallyWritable(file.virtualFile, null) } diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java index 7b84df9770d..fd7b796f257 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java @@ -28,126 +28,87 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigureProjectByChangingFileTest { - @TestMetadata("idea/testData/configuration/gradle") +public class MavenConfigureProjectByChangingFileTestGenerated extends AbstractMavenConfigureProjectByChangingFileTest { + @TestMetadata("idea/idea-maven/testData/configurator/jvm") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Gradle extends AbstractConfigureProjectByChangingFileTest { - public void testAllFilesPresentInGradle() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true); - } - - @TestMetadata("default_before.gradle") - public void testDefault() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/default_before.gradle"); - doTestGradle(fileName); - } - - @TestMetadata("eapVersion_before.gradle") - public void testEapVersion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/eapVersion_before.gradle"); - doTestGradle(fileName); - } - - @TestMetadata("missedLibrary_before.gradle") - public void testMissedLibrary() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/missedLibrary_before.gradle"); - doTestGradle(fileName); - } - - @TestMetadata("plugin_present_before.gradle") - public void testPlugin_present() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/plugin_present_before.gradle"); - doTestGradle(fileName); - } - - @TestMetadata("rcVersion_before.gradle") - public void testRcVersion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/rcVersion_before.gradle"); - doTestGradle(fileName); - } - } - - @TestMetadata("idea/testData/configuration/maven") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Maven extends AbstractConfigureProjectByChangingFileTest { - public void testAllFilesPresentInMaven() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/maven"), Pattern.compile("^([^\\.]+)$"), false); + public static class Jvm extends AbstractMavenConfigureProjectByChangingFileTest { + public void testAllFilesPresentInJvm() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-maven/testData/configurator/jvm"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("fixExisting") public void testFixExisting() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/fixExisting/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/fixExisting/"); doTestWithMaven(fileName); } @TestMetadata("libraryMissed") public void testLibraryMissed() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/libraryMissed/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/libraryMissed/"); doTestWithMaven(fileName); } @TestMetadata("pluginMissed") public void testPluginMissed() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/pluginMissed/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/pluginMissed/"); doTestWithMaven(fileName); } @TestMetadata("simpleProject") public void testSimpleProject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/simpleProject/"); doTestWithMaven(fileName); } @TestMetadata("simpleProjectEAP") public void testSimpleProjectEAP() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProjectEAP/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/"); doTestWithMaven(fileName); } @TestMetadata("simpleProjectRc") public void testSimpleProjectRc() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProjectRc/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/simpleProjectRc/"); doTestWithMaven(fileName); } @TestMetadata("simpleProjectSnapshot") public void testSimpleProjectSnapshot() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProjectSnapshot/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/"); doTestWithMaven(fileName); } } - @TestMetadata("idea/testData/configuration/js-maven") + @TestMetadata("idea/idea-maven/testData/configurator/js") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Js_maven extends AbstractConfigureProjectByChangingFileTest { - public void testAllFilesPresentInJs_maven() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/js-maven"), Pattern.compile("^([^\\.]+)$"), false); + public static class Js extends AbstractMavenConfigureProjectByChangingFileTest { + public void testAllFilesPresentInJs() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-maven/testData/configurator/js"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("libraryMissed") public void testLibraryMissed() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/libraryMissed/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/js/libraryMissed/"); doTestWithJSMaven(fileName); } @TestMetadata("pluginMissed") public void testPluginMissed() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/pluginMissed/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/js/pluginMissed/"); doTestWithJSMaven(fileName); } @TestMetadata("simpleProject") public void testSimpleProject() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/simpleProject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/js/simpleProject/"); doTestWithJSMaven(fileName); } @TestMetadata("simpleProjectSnapshot") public void testSimpleProjectSnapshot() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/simpleProjectSnapshot/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/"); doTestWithJSMaven(fileName); } } diff --git a/idea/idea-maven/testData/configurator/js/libraryMissed/pom.xml b/idea/idea-maven/testData/configurator/js/libraryMissed/pom.xml index f651c8a4765..eba696201aa 100644 --- a/idea/idea-maven/testData/configurator/js/libraryMissed/pom.xml +++ b/idea/idea-maven/testData/configurator/js/libraryMissed/pom.xml @@ -15,7 +15,7 @@ ${kotlin.version} - js + compile compile js diff --git a/idea/idea-maven/testData/configurator/js/libraryMissed/pom_after.xml b/idea/idea-maven/testData/configurator/js/libraryMissed/pom_after.xml index 7082e96db15..0654d642da1 100644 --- a/idea/idea-maven/testData/configurator/js/libraryMissed/pom_after.xml +++ b/idea/idea-maven/testData/configurator/js/libraryMissed/pom_after.xml @@ -16,14 +16,14 @@ ${kotlin.version} - js + compile compile js - js-test + test-compile test-compile test-js diff --git a/idea/idea-maven/testData/configurator/js/pluginMissed/pom_after.xml b/idea/idea-maven/testData/configurator/js/pluginMissed/pom_after.xml index dc6ae174135..1663f9b457e 100644 --- a/idea/idea-maven/testData/configurator/js/pluginMissed/pom_after.xml +++ b/idea/idea-maven/testData/configurator/js/pluginMissed/pom_after.xml @@ -27,14 +27,14 @@ ${kotlin.version} - js + compile compile js - js-test + test-compile test-compile test-js diff --git a/idea/idea-maven/testData/configurator/js/simpleProject/pom_after.xml b/idea/idea-maven/testData/configurator/js/simpleProject/pom_after.xml index 77b26462c3c..52d76362e2b 100644 --- a/idea/idea-maven/testData/configurator/js/simpleProject/pom_after.xml +++ b/idea/idea-maven/testData/configurator/js/simpleProject/pom_after.xml @@ -29,14 +29,14 @@ ${kotlin.version} - js + compile compile js - js-test + test-compile test-compile test-js diff --git a/idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/pom_after.xml b/idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/pom_after.xml index 7c71557ce2a..1a36d9599b0 100644 --- a/idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/pom_after.xml +++ b/idea/idea-maven/testData/configurator/js/simpleProjectSnapshot/pom_after.xml @@ -23,7 +23,7 @@ - false + true true @@ -37,7 +37,7 @@ - false + true true @@ -57,14 +57,14 @@ ${kotlin.version} - js + compile compile js - js-test + test-compile test-compile test-js diff --git a/idea/testData/configuration/maven/simpleProjectEAP/pom.xml b/idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/pom.xml similarity index 100% rename from idea/testData/configuration/maven/simpleProjectEAP/pom.xml rename to idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/pom.xml diff --git a/idea/testData/configuration/maven/simpleProjectEAP/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/pom_after.xml similarity index 87% rename from idea/testData/configuration/maven/simpleProjectEAP/pom_after.xml rename to idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/pom_after.xml index ec3da32c8c1..7deefcb3d8c 100644 --- a/idea/testData/configuration/maven/simpleProjectEAP/pom_after.xml +++ b/idea/idea-maven/testData/configurator/jvm/simpleProjectEAP/pom_after.xml @@ -7,39 +7,25 @@ maventest maventest 1.0-SNAPSHOT - - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - compile - - compile - - - - - - - - - test-compile - test-compile - - test-compile - - - - - - - - - + + + $VERSION$ + + + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + test + + + @@ -53,6 +39,7 @@ http://dl.bintray.com/kotlin/kotlin-eap + @@ -66,16 +53,33 @@ http://dl.bintray.com/kotlin/kotlin-eap - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - - $VERSION$ - + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + compile + + compile + + + + test-compile + test-compile + + test-compile + + + + + + diff --git a/idea/testData/configuration/maven/simpleProjectRc/pom.xml b/idea/idea-maven/testData/configurator/jvm/simpleProjectRc/pom.xml similarity index 100% rename from idea/testData/configuration/maven/simpleProjectRc/pom.xml rename to idea/idea-maven/testData/configurator/jvm/simpleProjectRc/pom.xml diff --git a/idea/testData/configuration/maven/simpleProjectRc/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/simpleProjectRc/pom_after.xml similarity index 87% rename from idea/testData/configuration/maven/simpleProjectRc/pom_after.xml rename to idea/idea-maven/testData/configurator/jvm/simpleProjectRc/pom_after.xml index d55ecdc5d21..dc699aec285 100644 --- a/idea/testData/configuration/maven/simpleProjectRc/pom_after.xml +++ b/idea/idea-maven/testData/configurator/jvm/simpleProjectRc/pom_after.xml @@ -7,39 +7,25 @@ maventest maventest 1.0-SNAPSHOT - - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - compile - - compile - - - - - - - - - test-compile - test-compile - - test-compile - - - - - - - - - + + + $VERSION$ + + + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + test + + + @@ -53,6 +39,7 @@ http://dl.bintray.com/kotlin/kotlin-eap + @@ -66,16 +53,33 @@ http://dl.bintray.com/kotlin/kotlin-eap - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - - $VERSION$ - + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + compile + + compile + + + + test-compile + test-compile + + test-compile + + + + + + diff --git a/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml b/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml index fb3057819a6..9630418dc36 100644 --- a/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml +++ b/idea/idea-maven/testData/configurator/jvm/simpleProjectSnapshot/pom_after.xml @@ -29,7 +29,7 @@ - false + true true @@ -43,7 +43,7 @@ - false + true true diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/GradleConfigureProjectByChangingFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/GradleConfigureProjectByChangingFileTestGenerated.java index 7fe12c8f061..ed1406b2b3a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/GradleConfigureProjectByChangingFileTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/GradleConfigureProjectByChangingFileTestGenerated.java @@ -41,6 +41,12 @@ public class GradleConfigureProjectByChangingFileTestGenerated extends AbstractG doTestGradle(fileName); } + @TestMetadata("eapVersion_before.gradle") + public void testEapVersion() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/eapVersion_before.gradle"); + doTestGradle(fileName); + } + @TestMetadata("missedLibrary_before.gradle") public void testMissedLibrary() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/missedLibrary_before.gradle"); @@ -52,4 +58,10 @@ public class GradleConfigureProjectByChangingFileTestGenerated extends AbstractG String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/plugin_present_before.gradle"); doTestGradle(fileName); } + + @TestMetadata("rcVersion_before.gradle") + public void testRcVersion() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/rcVersion_before.gradle"); + doTestGradle(fileName); + } }