diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt index f5aae8b28f0..d8d5f0aed3a 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt @@ -20,10 +20,6 @@ import org.junit.Test class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() { private fun kotlinVersion() = if (gradleKotlinPluginVersion == MINIMAL_SUPPORTED_VERSION) "1.3.50" else gradleKotlinPluginVersion - override fun isApplicableTest(): Boolean { - return !gradleVersion.startsWith("3.") - } - @Before fun saveSdksBeforeTest() { val kotlinSdks = sdkCreationChecker?.getKotlinSdks() ?: emptyList() diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt index 8330d34ee4c..48a972645ba 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt @@ -52,10 +52,6 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe assert(getModule(moduleName).getModuleWithDependenciesAndLibrariesScope(true).contains(file)) } - override fun isApplicableTest(): Boolean { - return shouldRunTest(gradleKotlinPluginVersion, gradleVersion) - } - @Test fun testPlatformToCommonDependency() { val files = configureByFiles() diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt index 7142e4de649..c4c56ba2285 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformTestCompatibilityMatrix.kt @@ -5,15 +5,4 @@ package org.jetbrains.kotlin.gradle -import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase.Companion.MINIMAL_SUPPORTED_VERSION - -//BUNCH 181 -fun MultiplatformProjectImportingTest.shouldRunTest(kotlinPluginVersion: String, gradleVersion: String): Boolean { - return MINIMAL_SUPPORTED_VERSION == kotlinPluginVersion -} - -fun NewMultiplatformProjectImportingTest.shouldRunTest(kotlinPluginVersion: String, gradleVersion: String): Boolean { - return !gradleVersion.startsWith("3.") -} - fun KaptImportingTest.isAndroidStudio() = false \ No newline at end of file diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt index 1e4f9ee904d..338edd60e9a 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt @@ -36,11 +36,6 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } } - override fun isApplicableTest(): Boolean { - return shouldRunTest(gradleKotlinPluginVersion, gradleVersion) - } - - @Test fun testProjectDependency() { configureByFiles() diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt.183 b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt.183 index 8e2e1c36428..83d26a83f54 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt.183 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt.183 @@ -39,11 +39,6 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } } - override fun isApplicableTest(): Boolean { - return shouldRunTest(gradleKotlinPluginVersion, gradleVersion) - } - - @Test fun testProjectDependency() { configureByFiles() diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java index a8c717e781a..5fa4be96b28 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java @@ -61,7 +61,7 @@ import static org.junit.Assume.assumeThat; @RunWith(value = Parameterized.class) public abstract class AbstractModelBuilderTest { - public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"3.5"}, {"4.9"}}; + public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}}; private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]"); diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.183 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.183 index 2b1009ce461..2f36428d610 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.183 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.183 @@ -60,7 +60,7 @@ import static org.junit.Assume.assumeThat; @RunWith(value = Parameterized.class) public abstract class AbstractModelBuilderTest { - public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"3.5"}, {"4.9"}}; + public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}}; private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]"); diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.193 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.193 index dfcd08752b5..2e39907c434 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.193 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractModelBuilderTest.java.193 @@ -60,7 +60,7 @@ import static org.junit.Assume.assumeThat; @RunWith(value = Parameterized.class) public abstract class AbstractModelBuilderTest { - public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"3.5"}, {"4.9"}}; + public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}}; private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]"); diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt index 3e27ddf669a..c455de5c839 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleConfiguratorTest.kt @@ -355,26 +355,6 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } } - @TargetVersions("3.5") - @Test - fun testAddLibraryGSKWithKotlinVersion() { - val files = importProjectFromTestData() - - runInEdtAndWait { - myTestFixture.project.executeWriteCommand("") { - val stdLibVersion = KotlinWithGradleConfigurator.getKotlinStdlibVersion(myTestFixture.module) - KotlinWithGradleConfigurator.addKotlinLibraryToModule( - myTestFixture.module, - DependencyScope.COMPILE, - object : ExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-reflect", stdLibVersion, stdLibVersion) { - override fun getLibraryClassesRoots() = emptyList() - }) - } - - checkFiles(files) - } - } - @Test fun testAddTestLibraryGSK() { val files = importProjectFromTestData() @@ -457,20 +437,6 @@ class GradleConfiguratorTest : GradleImportingTestCase() { } } - @TargetVersions("3.5") - @Test - fun testChangeCoroutinesSupportGSK() { - val files = importProjectFromTestData() - - runInEdtAndWait { - myTestFixture.project.executeWriteCommand("") { - KotlinWithGradleConfigurator.changeCoroutineConfiguration(myTestFixture.module, "enable") - } - - checkFiles(files) - } - } - @TargetVersions("4.4+") @Test fun testChangeCoroutinesSupportGSK49() {