From 33cacb87d3ea76e2d8a36d283e8efb2b490c976c Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Tue, 22 Oct 2019 14:25:07 +0300 Subject: [PATCH] Fix import tests for IDE 183 --- .../NewMultiplatformProjectImportingTest.kt.183 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 bb20079be6d..8e2e1c36428 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 @@ -55,6 +55,13 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin apiVersion("1.3") when (module.name) { "project", "app", "lib" -> additionalArguments(null) + "app_jvmMain", "app_jvmTest", "lib_jvmMain", "lib_jvmTest" -> + additionalArguments( + if (gradleKotlinPluginVersion == MINIMAL_SUPPORTED_VERSION) + "-version" + else + "-Xallow-no-source-files" + ) else -> additionalArguments("-version") } } @@ -292,6 +299,9 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin libraryDependency("Gradle: org.hamcrest:hamcrest-core:1.3@jar", DependencyScope.TEST) libraryDependency("Gradle: org.hamcrest:hamcrest-integration:1.3@jar", DependencyScope.TEST) libraryDependency("Gradle: org.hamcrest:hamcrest-library:1.3@jar", DependencyScope.TEST) + if (gradleKotlinPluginVersion != MINIMAL_SUPPORTED_VERSION) { + libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-android-extensions-runtime:${kotlinVersion()}@jar", DependencyScope.COMPILE) + } libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion()}@jar", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVersion()}@jar", DependencyScope.COMPILE) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}@jar", DependencyScope.COMPILE) @@ -334,7 +344,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin } var nativeVersion = when (gradleKotlinPluginVersion) { MINIMAL_SUPPORTED_VERSION -> "1.3.10" - else -> "1.3.20" + else -> "1.3.50" } module("shared_iOSMain") { libraryDependency("Kotlin/Native $nativeVersion - stdlib", DependencyScope.PROVIDED)