Fixup the tests vs master-gradle-plugin
Defined 4.0 and 1.3.0 as default versions of Gradle and plugin for PluginTargetVersions
Use `{{kotlin_plugin_repositories}}` template in testData of ImportTests
Update "mute" databases for new tests
Add `kotlin.stdlib.default.dependency=false` to some testData
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 6614e96..a1bef6f 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/HierarchicalMultiplatformProjectImportingTest.kt
@@ -10,6 +10,7 @@
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
+import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
import org.jetbrains.kotlin.platform.js.JsPlatforms
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.platform.konan.NativePlatforms
@@ -18,6 +19,8 @@
import org.junit.Before
import org.junit.Test
+const val hmppGradlePluginVersion = "1.3.50+"
+
class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
@Before
@@ -36,7 +39,7 @@
}
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = hmppGradlePluginVersion, gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testImportHMPPFlag() {
configureByFiles()
importProject()
@@ -51,7 +54,7 @@
}
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = hmppGradlePluginVersion, gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testImportIntermediateModules() {
configureByFiles()
importProject()
@@ -225,7 +228,7 @@
}
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = hmppGradlePluginVersion, gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testJvmWithJavaOnHMPP() {
configureByFiles()
importProject()
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
index 3ae4f46..1a7c618 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.gradle
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
+import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test
@@ -13,13 +14,13 @@
class ImportAndCheckHighlighting : MultiplePluginVersionGradleImportingTestCase() {
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testMultiplatformLibrary() {
importAndCheckHighlighting()
}
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testUnresolvedInMultiplatformLibrary() {
importAndCheckHighlighting(false, false)
}
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt
index 68a8de3..7c1ce0f 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckNavigation.kt
@@ -10,6 +10,7 @@
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.testFramework.runInEdtAndGet
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
+import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
import org.jetbrains.kotlin.idea.core.util.toPsiFile
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.psi.KtTreeVisitorVoid
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt
index 625b366..6c00727 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/KaptImportingTest.kt
@@ -9,14 +9,12 @@
import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
+import org.jetbrains.kotlin.idea.codeInsight.gradle.legacyMppImportTestMinVersionForMaster
+import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test
class KaptImportingTest : MultiplePluginVersionGradleImportingTestCase() {
- override fun isApplicableTest(): Boolean {
- return !gradleVersion.startsWith("3")
- }
-
fun importProject(modulePerSourceSet: Boolean) {
currentExternalProjectSettings.isResolveModulePerSourceSet = modulePerSourceSet
val isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories
@@ -29,6 +27,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testModulePerSourceSet() {
// Disable testing import module per source set test in Android Studio as this mode is not supported in Android Studio
if (isAndroidStudio()) {
@@ -61,6 +60,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testModulePerSourceSetDisabled() {
configureByFiles()
importProject(false)
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 3c3da21..60fc3a1 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt
@@ -25,9 +25,11 @@
import junit.framework.TestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.facetSettings
+import org.jetbrains.kotlin.idea.codeInsight.gradle.legacyMppImportTestMinVersionForMaster
import org.jetbrains.kotlin.idea.facet.KotlinFacet
import org.jetbrains.kotlin.idea.util.rootManager
import org.jetbrains.kotlin.test.KotlinTestUtils
+import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test
class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
@@ -53,6 +55,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testPlatformToCommonDependency() {
val files = configureByFiles()
importProject()
@@ -73,6 +76,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testPlatformToCommonExpectedByDependency() {
configureByFiles()
importProject()
@@ -87,6 +91,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testPlatformToCommonDependencyRoot() {
configureByFiles()
importProject()
@@ -97,6 +102,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testMultiProject() {
configureByFiles()
importProject()
@@ -111,6 +117,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testDependenciesReachableViaImpl() {
configureByFiles()
importProject()
@@ -127,6 +134,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testTransitiveImplement() {
configureByFiles()
@@ -175,6 +183,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testTransitiveImplementWithNonDefaultConfig() {
configureByFiles()
@@ -189,8 +198,8 @@
assertNoModuleDepForModule("project3_main", "project1_main")
TestCase.assertEquals(
- listOf("jar:///project2/build/libs/project2-jar.jar!/"),
- getDependencyLibraryUrls("project3_main")
+ listOf("jar:///project2/build/libs/project2-jar.jar!/"),
+ getDependencyLibraryUrls("project3_main")
)
currentExternalProjectSettings.isResolveModulePerSourceSet = false
@@ -210,8 +219,8 @@
assertModuleModuleDepScope("project3", "project1", DependencyScope.COMPILE)
TestCase.assertEquals(
- emptyList<String>(),
- getDependencyLibraryUrls("project3")
+ emptyList<String>(),
+ getDependencyLibraryUrls("project3")
)
} finally {
currentExternalProjectSettings.isResolveModulePerSourceSet = isResolveModulePerSourceSet
@@ -219,6 +228,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testTransitiveImplementWithAndroid() {
configureByFiles()
@@ -249,6 +259,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun simpleAndroidAppWithCommonModule() {
configureByFiles()
@@ -277,6 +288,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testJsTestOutputFile() {
configureByFiles()
@@ -293,6 +305,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testJsProductionOutputFile() {
configureByFiles()
importProject()
@@ -308,6 +321,7 @@
}
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testJsTestOutputFileInProjectWithAndroid() {
configureByFiles()
createProjectSubFile(
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformKaptProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformKaptProjectImportingTest.kt
index 95901a5..b541159 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformKaptProjectImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformKaptProjectImportingTest.kt
@@ -9,21 +9,17 @@
import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.roots.*
import com.intellij.openapi.roots.impl.ModulesOrderEnumerator
-import com.intellij.util.text.VersionComparatorUtil
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
+import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
import org.jetbrains.kotlin.idea.util.sourceRoots
+import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test
import java.io.File
class NewMultiplatformKaptProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
- override fun isApplicableTest(): Boolean {
- val isOldGradlePlugin = gradleKotlinPluginVersion != MINIMAL_SUPPORTED_VERSION
- && VersionComparatorUtil.compare(gradleKotlinPluginVersion, "1.3.40") < 0
-
- return !isOldGradlePlugin && VersionComparatorUtil.compare(gradleVersion, "4.0") >= 0
- }
@Test
+ @PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testKaptPaths() {
configureByFiles()
importProject()
@@ -76,6 +72,7 @@
}
@Test
+ @PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testRuntimeClasspath() {
configureByFiles()
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 8e0fffa3..5958c7f 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
@@ -11,6 +11,7 @@
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
+import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.platform.CommonPlatforms
import org.jetbrains.kotlin.platform.js.JsPlatforms
@@ -21,8 +22,6 @@
import org.junit.Before
import org.junit.Test
-const val mppImportTestMinVersionForMaster = "6.0+"
-
class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
@Before
@@ -41,7 +40,7 @@
}
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testProjectDependency() {
configureByFiles()
importProject()
@@ -238,7 +237,7 @@
}
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testUnresolvedDependency() {
configureByFiles()
importProject()
@@ -404,7 +403,7 @@
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.50+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testImportTestsAndTargets() {
configureByFiles()
importProject()
@@ -488,7 +487,7 @@
}
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testDependencyOnRoot() {
configureByFiles()
importProject()
@@ -533,7 +532,7 @@
}
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.10+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testNestedDependencies() {
configureByFiles()
importProject()
@@ -638,7 +637,7 @@
* dependencies in multiplatform project included in composite build
*/
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.20+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.20+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testPlatformToCommonExpByInComposite() {
configureByFiles()
importProject(true)
@@ -678,7 +677,7 @@
* Test case for issue https://youtrack.jetbrains.com/issue/KT-29757
*/
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.40+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testJavaTransitiveOnMPP() {
configureByFiles()
importProject(true)
@@ -740,7 +739,7 @@
* Test case for issue https://youtrack.jetbrains.com/issue/KT-28822
*/
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.41+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.41+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testImportBeforeBuild() {
configureByFiles()
importProject(true)
@@ -803,7 +802,7 @@
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.20+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.20+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testProductionOnTestFlag() {
configureByFiles()
importProject(true)
@@ -816,7 +815,7 @@
}
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testJvmWithJava() {
configureByFiles()
importProject(true)
@@ -869,7 +868,7 @@
}
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testCommonTestTargetPlatform() {
configureByFiles()
importProject(true)
@@ -891,7 +890,7 @@
}
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.60+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.60+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testIgnoreIncompatibleNativeTestTasks() {
configureByFiles()
importProject()
@@ -946,7 +945,7 @@
@Test
- @PluginTargetVersions(gradleVersion = "4.0+", pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
+ @PluginTargetVersions(pluginVersion = "1.3.30+", gradleVersionForLatestPlugin = mppImportTestMinVersionForMaster)
fun testMutableArtifactLists() {
configureByFiles()
importProject(true)
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/PackagePrefixImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/PackagePrefixImportingTest.kt
index 9ed8d13..e68b3f5 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/PackagePrefixImportingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/PackagePrefixImportingTest.kt
@@ -5,19 +5,17 @@
package org.jetbrains.kotlin.gradle
-import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
-import com.intellij.openapi.module.ModuleManager
-import com.intellij.openapi.roots.*
-import com.intellij.openapi.roots.impl.ModulesOrderEnumerator
-import com.intellij.openapi.util.text.StringUtil
import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
+import org.jetbrains.kotlin.idea.codeInsight.gradle.legacyMppImportTestMinVersionForMaster
+import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test
class PackagePrefixImportingTest : MultiplePluginVersionGradleImportingTestCase() {
@Test
+ @PluginTargetVersions(gradleVersionForLatestPlugin = legacyMppImportTestMinVersionForMaster)
fun testPackagePrefixNonMPP() {
configureByFiles()
importProject()
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
index ae0910c..182753c 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
@@ -16,6 +16,9 @@
import java.io.File
import java.util.*
+const val mppImportTestMinVersionForMaster = "6.0+"
+const val legacyMppImportTestMinVersionForMaster = "5.3+"
+
abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTestCase() {
@Rule
@JvmField
@@ -53,16 +56,16 @@
)
private fun readPluginVersion() =
- File("libraries/tools/kotlin-gradle-plugin/build/libs").listFiles()?.map { it.name }?.firstOrNull { it.contains("-original.jar") }?.replace(
- "kotlin-gradle-plugin-",
- ""
- )?.replace("-original.jar", "") ?: "1.4.255-SNAPSHOT"
+ File("libraries/tools/kotlin-gradle-plugin/build/libs").listFiles()?.map { it.name }
+ ?.firstOrNull { it.contains("-original.jar") }?.replace(
+ "kotlin-gradle-plugin-",
+ ""
+ )?.replace("-original.jar", "") ?: "1.4.255-SNAPSHOT"
@JvmStatic
@Parameterized.Parameters(name = "{index}: Gradle-{0}, KotlinGradlePlugin-{1}")
fun data(): Collection<Array<Any>> {
- //TODO(auskov): remove extending list of gradle versions when tested version are advanced
- return (AbstractModelBuilderTest.SUPPORTED_GRADLE_VERSIONS + arrayOf("6.5")).flatMap { gradleVersion ->
+ return (AbstractModelBuilderTest.SUPPORTED_GRADLE_VERSIONS).flatMap { gradleVersion ->
KOTLIN_GRADLE_PLUGIN_VERSIONS.map { kotlinVersion ->
arrayOf<Any>(
gradleVersion[0],
@@ -74,9 +77,13 @@
}
fun repositories(useKts: Boolean): String {
- val customRepositories = arrayOf("https://dl.bintray.com/kotlin/kotlin-dev", "http://dl.bintray.com/kotlin/kotlin-eap")
+ val customRepositories = arrayOf(
+ "https://dl.bintray.com/kotlin/kotlin-dev",
+ "http://dl.bintray.com/kotlin/kotlin-eap"
+ )
val customMavenRepositories = customRepositories.map { if (useKts) "maven(\"$it\")" else "maven { url '$it' } " }.joinToString("\n")
return """
+ mavenCentral()
mavenLocal()
google()
jcenter()
diff --git a/idea/idea-gradle/tests/org/jetbrains/plugins/gradle/tooling/annotation/PluginTargetVersions.java b/idea/idea-gradle/tests/org/jetbrains/plugins/gradle/tooling/annotation/PluginTargetVersions.java
index 1411b8c..464c912 100644
--- a/idea/idea-gradle/tests/org/jetbrains/plugins/gradle/tooling/annotation/PluginTargetVersions.java
+++ b/idea/idea-gradle/tests/org/jetbrains/plugins/gradle/tooling/annotation/PluginTargetVersions.java
@@ -12,9 +12,9 @@
@Target({ElementType.TYPE, ElementType.METHOD})
public @interface PluginTargetVersions {
- String gradleVersion() default "";
+ String gradleVersion() default "4.0+";
- String pluginVersion() default "";
+ String pluginVersion() default "1.3.0+";
String gradleVersionForLatestPlugin() default "";
}
\ No newline at end of file
diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle
index eb69e40..c5eb7f5 100644
--- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle
+++ b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/build.gradle
@@ -2,7 +2,7 @@
id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
}
repositories {
- mavenCentral()
+ {{kotlin_plugin_repositories}}
}
group 'com.example'
version '0.0.1'
diff --git a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle
index 6993f68..65d15f5 100644
--- a/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle
+++ b/idea/testData/gradle/importAndCheckHighlighting/multiplatformLibrary/settings.gradle
@@ -1,3 +1,9 @@
+pluginManagement {
+ repositories {
+ {{kotlin_plugin_repositories}}
+ }
+}
+
rootProject.name = 'mppLibrary'
enableFeaturePreview('GRADLE_METADATA')
diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle
index eb69e40..c5eb7f5 100644
--- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle
+++ b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/build.gradle
@@ -2,7 +2,7 @@
id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
}
repositories {
- mavenCentral()
+ {{kotlin_plugin_repositories}}
}
group 'com.example'
version '0.0.1'
diff --git a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle
index 6993f68..65d15f5 100644
--- a/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle
+++ b/idea/testData/gradle/importAndCheckHighlighting/unresolvedInMultiplatformLibrary/settings.gradle
@@ -1,3 +1,9 @@
+pluginManagement {
+ repositories {
+ {{kotlin_plugin_repositories}}
+ }
+}
+
rootProject.name = 'mppLibrary'
enableFeaturePreview('GRADLE_METADATA')
diff --git a/idea/testData/gradle/kaptImportingTest/modulePerSourceSet/build.gradle b/idea/testData/gradle/kaptImportingTest/modulePerSourceSet/build.gradle
index c2ab298..e04c002 100644
--- a/idea/testData/gradle/kaptImportingTest/modulePerSourceSet/build.gradle
+++ b/idea/testData/gradle/kaptImportingTest/modulePerSourceSet/build.gradle
@@ -1,9 +1,7 @@
buildscript {
ext.kotlin_version = '{{kotlin_plugin_version}}'
repositories {
- google()
- jcenter()
-
+ {{kotlin_plugin_repositories}}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
diff --git a/idea/testData/gradle/kaptImportingTest/modulePerSourceSet/gradle.properties b/idea/testData/gradle/kaptImportingTest/modulePerSourceSet/gradle.properties
new file mode 100644
index 0000000..0480fdc
--- /dev/null
+++ b/idea/testData/gradle/kaptImportingTest/modulePerSourceSet/gradle.properties
@@ -0,0 +1 @@
+kotlin.stdlib.default.dependency=false
\ No newline at end of file
diff --git a/idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/build.gradle b/idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/build.gradle
index c2ab298..e04c002 100644
--- a/idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/build.gradle
+++ b/idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/build.gradle
@@ -1,9 +1,7 @@
buildscript {
ext.kotlin_version = '{{kotlin_plugin_version}}'
repositories {
- google()
- jcenter()
-
+ {{kotlin_plugin_repositories}}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
diff --git a/idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/gradle.properties b/idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/gradle.properties
new file mode 100644
index 0000000..0480fdc
--- /dev/null
+++ b/idea/testData/gradle/kaptImportingTest/modulePerSourceSetDisabled/gradle.properties
@@ -0,0 +1 @@
+kotlin.stdlib.default.dependency=false
\ No newline at end of file
diff --git a/idea/testData/gradle/multiplatform/dependenciesReachableViaImpl/build.gradle b/idea/testData/gradle/multiplatform/dependenciesReachableViaImpl/build.gradle
index d5b7cac..f5afd30 100644
--- a/idea/testData/gradle/multiplatform/dependenciesReachableViaImpl/build.gradle
+++ b/idea/testData/gradle/multiplatform/dependenciesReachableViaImpl/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- mavenCentral()
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/jsProductionOutputFile/build.gradle b/idea/testData/gradle/multiplatform/jsProductionOutputFile/build.gradle
index 84284b3..4a79327 100644
--- a/idea/testData/gradle/multiplatform/jsProductionOutputFile/build.gradle
+++ b/idea/testData/gradle/multiplatform/jsProductionOutputFile/build.gradle
@@ -1,7 +1,6 @@
buildscript {
repositories {
- jcenter()
- maven { url 'https://maven.google.com' }
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/jsTestOutputFile/build.gradle b/idea/testData/gradle/multiplatform/jsTestOutputFile/build.gradle
index 84284b3..4a79327 100644
--- a/idea/testData/gradle/multiplatform/jsTestOutputFile/build.gradle
+++ b/idea/testData/gradle/multiplatform/jsTestOutputFile/build.gradle
@@ -1,7 +1,6 @@
buildscript {
repositories {
- jcenter()
- maven { url 'https://maven.google.com' }
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/build.gradle b/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/build.gradle
index 03365b5..6dde559 100644
--- a/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/build.gradle
+++ b/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/build.gradle
@@ -1,7 +1,6 @@
buildscript {
repositories {
- jcenter()
- maven { url 'https://maven.google.com' }
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project1/build.gradle b/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project1/build.gradle
index 1198ef2..30df63f 100644
--- a/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project1/build.gradle
+++ b/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project1/build.gradle
@@ -1,7 +1,6 @@
buildscript {
repositories {
- jcenter()
- maven { url 'https://maven.google.com' }
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project2/build.gradle b/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project2/build.gradle
index e8c8b08..72cc10f 100644
--- a/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project2/build.gradle
+++ b/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project2/build.gradle
@@ -1,7 +1,6 @@
buildscript {
repositories {
- jcenter()
- maven { url 'https://maven.google.com' }
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project3/build.gradle b/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project3/build.gradle
index 8681ae8..cdebb64 100644
--- a/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project3/build.gradle
+++ b/idea/testData/gradle/multiplatform/jsTestOutputFileInProjectWithAndroid/project3/build.gradle
@@ -1,7 +1,6 @@
buildscript {
repositories {
- jcenter()
- maven { url 'https://maven.google.com' }
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/multiProject/build.gradle b/idea/testData/gradle/multiplatform/multiProject/build.gradle
index 76a49f2..0215dfc 100644
--- a/idea/testData/gradle/multiplatform/multiProject/build.gradle
+++ b/idea/testData/gradle/multiplatform/multiProject/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- mavenCentral()
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/multiProject/gradle.properties b/idea/testData/gradle/multiplatform/multiProject/gradle.properties
new file mode 100644
index 0000000..0480fdc
--- /dev/null
+++ b/idea/testData/gradle/multiplatform/multiProject/gradle.properties
@@ -0,0 +1 @@
+kotlin.stdlib.default.dependency=false
\ No newline at end of file
diff --git a/idea/testData/gradle/multiplatform/platformToCommonDependency/build.gradle b/idea/testData/gradle/multiplatform/platformToCommonDependency/build.gradle
index 2379909..5260570 100644
--- a/idea/testData/gradle/multiplatform/platformToCommonDependency/build.gradle
+++ b/idea/testData/gradle/multiplatform/platformToCommonDependency/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- mavenCentral()
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/platformToCommonDependencyRoot/build.gradle b/idea/testData/gradle/multiplatform/platformToCommonDependencyRoot/build.gradle
index 33c2d76..2441412 100644
--- a/idea/testData/gradle/multiplatform/platformToCommonDependencyRoot/build.gradle
+++ b/idea/testData/gradle/multiplatform/platformToCommonDependencyRoot/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- mavenCentral()
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle b/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle
index 20fc853..3f2a217 100644
--- a/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle
+++ b/idea/testData/gradle/multiplatform/platformToCommonExpectedByDependency/build.gradle
@@ -1,7 +1,6 @@
buildscript {
repositories {
- mavenCentral()
- maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/simpleAndroidAppWithCommonModule/build.gradle b/idea/testData/gradle/multiplatform/simpleAndroidAppWithCommonModule/build.gradle
index e7f25ee..c8fa3ee 100644
--- a/idea/testData/gradle/multiplatform/simpleAndroidAppWithCommonModule/build.gradle
+++ b/idea/testData/gradle/multiplatform/simpleAndroidAppWithCommonModule/build.gradle
@@ -1,7 +1,6 @@
buildscript {
repositories {
- jcenter()
- maven { url 'https://maven.google.com' }
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/transitiveImplement/build.gradle b/idea/testData/gradle/multiplatform/transitiveImplement/build.gradle
index 19fa3de..3b40b8e 100644
--- a/idea/testData/gradle/multiplatform/transitiveImplement/build.gradle
+++ b/idea/testData/gradle/multiplatform/transitiveImplement/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- mavenCentral()
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/transitiveImplement/gradle.properties b/idea/testData/gradle/multiplatform/transitiveImplement/gradle.properties
new file mode 100644
index 0000000..0480fdc
--- /dev/null
+++ b/idea/testData/gradle/multiplatform/transitiveImplement/gradle.properties
@@ -0,0 +1 @@
+kotlin.stdlib.default.dependency=false
\ No newline at end of file
diff --git a/idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/build.gradle b/idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/build.gradle
index 03365b5..6dde559 100644
--- a/idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/build.gradle
+++ b/idea/testData/gradle/multiplatform/transitiveImplementWithAndroid/build.gradle
@@ -1,7 +1,6 @@
buildscript {
repositories {
- jcenter()
- maven { url 'https://maven.google.com' }
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/build.gradle b/idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/build.gradle
index 3fcb45e..2e2e307 100644
--- a/idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/build.gradle
+++ b/idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
- mavenCentral()
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/gradle.properties b/idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/gradle.properties
new file mode 100644
index 0000000..0480fdc
--- /dev/null
+++ b/idea/testData/gradle/multiplatform/transitiveImplementWithNonDefaultConfig/gradle.properties
@@ -0,0 +1 @@
+kotlin.stdlib.default.dependency=false
\ No newline at end of file
diff --git a/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle b/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle
index 3a83d3d..68b2f43 100644
--- a/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle
+++ b/idea/testData/gradle/packagePrefixImport/packagePrefixNonMPP/build.gradle
@@ -1,7 +1,6 @@
buildscript {
repositories {
- mavenCentral()
- maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+ {{kotlin_plugin_repositories}}
}
dependencies {
diff --git a/tests/mute-common.csv b/tests/mute-common.csv
index 078ebbd..460e57b 100644
--- a/tests/mute-common.csv
+++ b/tests/mute-common.csv
@@ -6,15 +6,11 @@
org.jetbrains.kotlin.checkers.JavaAgainstKotlinSourceCheckerWithoutUltraLightTestGenerated.JavaAgainstKotlin.testUsingMutableInterfaces,,, FLAKY
org.jetbrains.kotlin.checkers.JavaAgainstKotlinSourceCheckerWithoutUltraLightTestGenerated.JavaAgainstKotlin.testUsingReadOnlyInterfaces,,, FLAKY
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testAndroidDependencyOnMPP[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Import Tests,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testAndroidDependencyOnMPP[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Import Tests,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testAndroidDependencyOnMPP[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Import Tests,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testAndroidDependencyOnMPP[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Import Tests,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testAndroidDependencyOnMPP[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Import Tests,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDetectAndroidSources[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Import Tests,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDetectAndroidSources[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Import Tests,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDetectAndroidSources[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Import Tests,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDetectAndroidSources[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Import Tests,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDetectAndroidSources[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Import Tests,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testSingleAndroidTarget[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Stable on windows,, FLAKY
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testSingleAndroidTarget[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Stable on windows,, FLAKY
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testSingleAndroidTarget[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Stable on windows,, FLAKY
org.jetbrains.kotlin.idea.caches.resolve.MultiPlatformHighlightingTestGenerated.testJvmKotlinReferencesCommonKotlinThroughJavaDifferentJvmImpls, Always red,,
org.jetbrains.kotlin.idea.codeInsight.gradle.GradleBuildFileHighlightingTest.testKtsInJsProject[1: with Gradle-5.6.4], ERROR: Diagnostic's list should be empty,,
org.jetbrains.kotlin.idea.codeInsight.gradle.GradleBuildFileHighlightingTest.testKtsInJsProject[0: with Gradle-4.9], ERROR: Diagnostic's list should be empty,,
diff --git a/tests/mute-platform.csv b/tests/mute-platform.csv
index 45eca5a..a68348c 100644
--- a/tests/mute-platform.csv
+++ b/tests/mute-platform.csv
@@ -3,37 +3,25 @@
org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryNestedClassUsages, KT-34542, FAIL,
org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryObjectUsages, KT-34542, FAIL,
"org.jetbrains.kotlin.gradle.HierarchicalMultiplatformProjectImportingTest.testJvmWithJavaOnHMPP[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", No module dependency found,,
-"org.jetbrains.kotlin.gradle.HierarchicalMultiplatformProjectImportingTest.testJvmWithJavaOnHMPP[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", No module dependency found,,
+"org.jetbrains.kotlin.gradle.HierarchicalMultiplatformProjectImportingTest.testJvmWithJavaOnHMPP[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", No module dependency found,,
org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.simpleAndroidAppWithCommonModule, KT-35225,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testDependenciesReachableViaImpl[0: Gradle-4.9, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testDependenciesReachableViaImpl[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testDependenciesReachableViaImpl[2: Gradle-5.6.4, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testDependenciesReachableViaImpl[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[0: Gradle-4.9, KotlinGradlePlugin-minimal]", NPE - no facet configured,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", NPE - no facet configured,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[2: Gradle-5.6.4, KotlinGradlePlugin-minimal]", NPE - no facet configured,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", NPE - no facet configured,,
+org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testDependenciesReachableViaImpl, Gradle Tests in 201,,
+org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid, NPE - no facet configured,,
org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithAndroid, KT-35225,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithNonDefaultConfig[0: Gradle-4.9, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithNonDefaultConfig[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithNonDefaultConfig[2: Gradle-5.6.4, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithNonDefaultConfig[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplement[0: Gradle-4.9, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplement[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplement[2: Gradle-5.6.4, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplement[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithNonDefaultConfig, Gradle Tests in 201,,
+org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplement, Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDependencyOnRoot[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDependencyOnRoot[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDependencyOnRoot[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testImportBeforeBuild[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testImportBeforeBuild[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testImportBeforeBuild[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJavaTransitiveOnMPP[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJavaTransitiveOnMPP[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJavaTransitiveOnMPP[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJvmWithJava[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJvmWithJava[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJvmWithJava[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testNestedDependencies[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testNestedDependencies[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testNestedDependencies[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testProjectDependency[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testProjectDependency[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testProjectDependency[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
org.jetbrains.kotlin.idea.caches.resolve.MultiModuleLineMarkerTestGenerated.testKotlinTestAnnotations, No line markers for test run,,
org.jetbrains.kotlin.idea.codeInsight.InspectionTestGenerated.Inspections.testAndroidIllegalIdentifiers_inspectionData_Inspections_test, Unprocessed,,
org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testAndroidGradleJsDetection, NPE during import,,
diff --git a/tests/mute-platform.csv.202 b/tests/mute-platform.csv.202
index c43b7ae..d1f0404 100644
--- a/tests/mute-platform.csv.202
+++ b/tests/mute-platform.csv.202
@@ -3,37 +3,25 @@
org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryNestedClassUsages, KT-34542, FAIL,
org.jetbrains.kotlin.findUsages.KotlinFindUsagesWithLibraryTestGenerated.KotlinLibrary.testLibraryObjectUsages, KT-34542, FAIL,
"org.jetbrains.kotlin.gradle.HierarchicalMultiplatformProjectImportingTest.testJvmWithJavaOnHMPP[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", No module dependency found,,
-"org.jetbrains.kotlin.gradle.HierarchicalMultiplatformProjectImportingTest.testJvmWithJavaOnHMPP[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", No module dependency found,,
+"org.jetbrains.kotlin.gradle.HierarchicalMultiplatformProjectImportingTest.testJvmWithJavaOnHMPP[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", No module dependency found,,
org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.simpleAndroidAppWithCommonModule, KT-35225,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testDependenciesReachableViaImpl[0: Gradle-4.9, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testDependenciesReachableViaImpl[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testDependenciesReachableViaImpl[2: Gradle-5.6.4, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testDependenciesReachableViaImpl[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[0: Gradle-4.9, KotlinGradlePlugin-minimal]", NPE - no facet configured,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", NPE - no facet configured,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[2: Gradle-5.6.4, KotlinGradlePlugin-minimal]", NPE - no facet configured,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", NPE - no facet configured,,
+org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testDependenciesReachableViaImpl, Gradle Tests in 201,,
+org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testJsTestOutputFileInProjectWithAndroid, NPE - no facet configured,,
org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithAndroid, KT-35225,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithNonDefaultConfig[0: Gradle-4.9, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithNonDefaultConfig[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithNonDefaultConfig[2: Gradle-5.6.4, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithNonDefaultConfig[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplement[0: Gradle-4.9, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplement[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplement[2: Gradle-5.6.4, KotlinGradlePlugin-minimal]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplement[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplementWithNonDefaultConfig, Gradle Tests in 201,,
+org.jetbrains.kotlin.gradle.MultiplatformProjectImportingTest.testTransitiveImplement, Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDependencyOnRoot[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDependencyOnRoot[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testDependencyOnRoot[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testImportBeforeBuild[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testImportBeforeBuild[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testImportBeforeBuild[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJavaTransitiveOnMPP[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJavaTransitiveOnMPP[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJavaTransitiveOnMPP[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJvmWithJava[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJvmWithJava[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testJvmWithJava[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testNestedDependencies[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testNestedDependencies[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testNestedDependencies[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testProjectDependency[1: Gradle-4.9, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
-"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testProjectDependency[3: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
+"org.jetbrains.kotlin.gradle.NewMultiplatformProjectImportingTest.testProjectDependency[4: Gradle-5.6.4, KotlinGradlePlugin-latest stable]", Gradle Tests in 201,,
org.jetbrains.kotlin.idea.caches.resolve.MultiModuleLineMarkerTestGenerated.testKotlinTestAnnotations, No line markers for test run,,
org.jetbrains.kotlin.idea.codeInsight.InspectionTestGenerated.Inspections.testAndroidIllegalIdentifiers_inspectionData_Inspections_test, Unprocessed,,
org.jetbrains.kotlin.idea.codeInsight.gradle.GradleFacetImportTest.testAndroidGradleJsDetection, NPE during import,,
