Update to 193.5233.102 release (KT-35239)

- Mute android specific import tests (KT-35225).
- Mute GradleMultiplatformWizardTest (IDEA-225878).
- Minor update of test data.
This commit is contained in:
Nikolay Krasko
2019-11-28 13:08:58 +03:00
parent fa64b5794b
commit 29fbb8e22f
6 changed files with 50 additions and 4 deletions
@@ -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<Abs
}
}
override fun shouldRunTest(): Boolean {
return super.shouldRunTest() && !isIgnoredInDatabaseWithLog(this)
}
companion object {
val externalSystemId = GradleConstants.SYSTEM_ID
}
@@ -0,0 +1,22 @@
plugins {
id 'org.jetbrains.kotlin.jvm' version '1.2.60-dev-286'
}
group 'testgroup'
version '1.0-SNAPSHOT'
repositories {
maven { url 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven' }
mavenCentral()
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
}
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}