azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix import tests for IDE 183

Browse Source
This commit is contained in:
Andrey Uskov
2019-10-22 14:25:07 +03:00
parent 4b2834c4a8
commit 33cacb87d3
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt.183
+11 -1
View File
@@ -55,6 +55,13 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
apiVersion("1.3") apiVersion("1.3")
when (module.name) { when (module.name) {
"project", "app", "lib" -> additionalArguments(null) "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") 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-core:1.3@jar", DependencyScope.TEST)
libraryDependency("Gradle: org.hamcrest:hamcrest-integration: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) 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-common:${kotlinVersion()}@jar", DependencyScope.COMPILE)
libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:${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) libraryDependency("Gradle: org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion()}@jar", DependencyScope.COMPILE)
@@ -334,7 +344,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
} }
var nativeVersion = when (gradleKotlinPluginVersion) { var nativeVersion = when (gradleKotlinPluginVersion) {
MINIMAL_SUPPORTED_VERSION -> "1.3.10" MINIMAL_SUPPORTED_VERSION -> "1.3.10"
else -> "1.3.20" else -> "1.3.50"
} }
module("shared_iOSMain") { module("shared_iOSMain") {
libraryDependency("Kotlin/Native $nativeVersion - stdlib", DependencyScope.PROVIDED) libraryDependency("Kotlin/Native $nativeVersion - stdlib", DependencyScope.PROVIDED)