From 14aa0eae71a04a5dc8df9a6005e32136e623e071 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Fri, 8 Nov 2019 16:10:44 +0300 Subject: [PATCH] Extract kotlin gradle plugin versions to constants in tests --- .../kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt | 3 ++- .../codeInsight/gradle/ExternalSystemImportingTestCase.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt index 8f2ab4839ff..894512e9775 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt @@ -43,6 +43,7 @@ import com.intellij.testFramework.UsefulTestCase import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.ContainerUtilRt import junit.framework.TestCase +import org.jetbrains.kotlin.idea.codeInsight.gradle.ExternalSystemImportingTestCase.LATEST_STABLE_GRADLE_PLUGIN_VERSION import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleImportingTestCase import org.jetbrains.kotlin.idea.configuration.KotlinGradleAbstractMultiplatformModuleBuilder import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper @@ -57,7 +58,7 @@ import java.io.IOException abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase() { - private val pluginVersion = "1.3.50" + private val pluginVersion = LATEST_STABLE_GRADLE_PLUGIN_VERSION override fun createWizard(project: Project?, directory: File): AbstractProjectWizard { return NewProjectWizard(project, ModulesProvider.EMPTY_MODULES_PROVIDER, directory.path) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java index 81a29bfca42..bb5c178268e 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java @@ -52,6 +52,9 @@ import org.apache.log4j.Level; // part of com.intellij.openapi.externalSystem.test.ExternalSystemImportingTestCase public abstract class ExternalSystemImportingTestCase extends ExternalSystemTestCase { + public static final String MINIMAL_SUPPORTED_GRADLE_PLUGIN_VERSION = "1.3.0"; + public static final String LATEST_STABLE_GRADLE_PLUGIN_VERSION = "1.3.50"; + private Logger logger; @Override