Kotlin Facet: Fix detection of pre-1.1-beta JS-stdlib dependencies

This commit is contained in:
Alexey Sedunov
2017-02-14 18:24:22 +03:00
parent 5515a63911
commit e1463f9e0f
3 changed files with 34 additions and 1 deletions
@@ -150,7 +150,7 @@ fun KotlinFacetSettings.initializeIfNeeded(module: Module, rootModel: ModuleRoot
val TargetPlatformKind<*>.mavenLibraryIds: List<String>
get() = when (this) {
is TargetPlatformKind.Jvm -> listOf(MAVEN_STDLIB_ID, MAVEN_STDLIB_ID_JRE7, MAVEN_STDLIB_ID_JRE8)
is TargetPlatformKind.JavaScript -> listOf(MAVEN_JS_STDLIB_ID)
is TargetPlatformKind.JavaScript -> listOf(MAVEN_JS_STDLIB_ID, MAVEN_OLD_JS_STDLIB_ID)
is TargetPlatformKind.Common -> listOf(MAVEN_COMMON_STDLIB_ID)
}
@@ -296,4 +296,5 @@ val MAVEN_STDLIB_ID = "kotlin-stdlib"
val MAVEN_STDLIB_ID_JRE7 = "kotlin-stdlib-jre7"
val MAVEN_STDLIB_ID_JRE8 = "kotlin-stdlib-jre8"
val MAVEN_JS_STDLIB_ID = "kotlin-stdlib-js"
val MAVEN_OLD_JS_STDLIB_ID = "kotlin-js-library"
val MAVEN_COMMON_STDLIB_ID = "kotlin-stdlib-common" // TODO: KotlinCommonMavenConfigurator
@@ -233,6 +233,38 @@ class GradleFacetImportTest : GradleImportingTestCase() {
}
}*/
@Test
fun testDetectOldJsStdlib() {
createProjectSubFile("build.gradle", """
group 'Again'
version '1.0-SNAPSHOT'
buildscript {
repositories {
mavenCentral()
maven {
url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.6")
}
}
apply plugin: 'kotlin2js'
dependencies {
compile "org.jetbrains.kotlin:kotlin-js-library:1.0.6"
}
""")
importProject()
with (facetSettings) {
Assert.assertEquals(TargetPlatformKind.JavaScript, versionInfo.targetPlatformKind)
}
}
@Test
fun testCommonImport() {
createProjectSubFile("build.gradle", """