diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 9ab9598dfe0..669f5bde6cb 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -68,6 +68,10 @@ dependencies { Platform[192].orHigher { testCompile(intellijDep()) { includeJars("platform-util-ui", "platform-concurrency", "platform-objectSerializer") } } + + Platform[193].orHigher { + testCompile(intellijDep()) { includeJars("platform-ide-util-io") } + } } sourceSets { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithDatabase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithDatabase.kt index 794fbea1fb6..fff9f24ff19 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithDatabase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithDatabase.kt @@ -165,7 +165,7 @@ class RunnerFactoryWithMuteInDatabase: ParametersRunnerFactory { } } -private fun isIgnoredInDatabaseWithLog(child: FrameworkMethod): Boolean { +fun isIgnoredInDatabaseWithLog(child: FrameworkMethod): Boolean { if (isMutedInDatabase(child.method)) { System.err.println(mutedMessage(testKey(child.method))) return true @@ -174,6 +174,15 @@ private fun isIgnoredInDatabaseWithLog(child: FrameworkMethod): Boolean { return false } +fun isIgnoredInDatabaseWithLog(testCase: TestCase): Boolean { + if (isMutedInDatabase(testCase)) { + System.err.println(mutedMessage(testKey(testCase))) + return true + } + + return false +} + fun TestCase.runTest(test: () -> Unit) { (wrapWithMuteInDatabase(this, test) ?: test).invoke() } \ No newline at end of file diff --git a/gradle/versions.properties.193 b/gradle/versions.properties.193 index effd4dc3ba5..c4fc46a75df 100644 --- a/gradle/versions.properties.193 +++ b/gradle/versions.properties.193 @@ -1,4 +1,4 @@ -versions.intellijSdk=193.4778.7-EAP-SNAPSHOT +versions.intellijSdk=193.5233.102 versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=181.3494.12 versions.jar.asm-all=7.0.1 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 33d896a1075..db11313f84b 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt @@ -46,6 +46,7 @@ import org.jetbrains.kotlin.idea.codeInsight.gradle.ExternalSystemImportingTestC import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleImportingTestCase import org.jetbrains.kotlin.idea.configuration.KotlinGradleAbstractMultiplatformModuleBuilder import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe +import org.jetbrains.kotlin.test.isIgnoredInDatabaseWithLog import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper import org.jetbrains.plugins.gradle.settings.DistributionType import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings @@ -256,6 +257,10 @@ abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase