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

Fix bunch compilation for AS 3.1/3.2

Browse Source
This commit is contained in:
Yan Zhulanow
2018-09-05 17:03:32 +03:00
parent 051ad0f79e
commit 17849473d6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31
+3 -3
View File
@@ -520,7 +520,7 @@ compileTestKotlin {
Assert.assertEquals("1.1", apiLevel!!.versionString) Assert.assertEquals("1.1", apiLevel!!.versionString)
Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) Assert.assertTrue(platform.isJavaScript)
with(compilerArguments as K2JSCompilerArguments) { with(compilerArguments as K2JSCompilerArguments) {
Assert.assertEquals(true, sourceMap) Assert.assertEquals(true, sourceMap)
Assert.assertEquals("plain", moduleKind) Assert.assertEquals("plain", moduleKind)
@@ -536,7 +536,7 @@ compileTestKotlin {
Assert.assertEquals("1.0", apiLevel!!.versionString) Assert.assertEquals("1.0", apiLevel!!.versionString)
Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) Assert.assertTrue(platform.isJavaScript)
with(compilerArguments as K2JSCompilerArguments) { with(compilerArguments as K2JSCompilerArguments) {
Assert.assertEquals(false, sourceMap) Assert.assertEquals(false, sourceMap)
Assert.assertEquals("umd", moduleKind) Assert.assertEquals("umd", moduleKind)
@@ -1210,7 +1210,7 @@ compileTestKotlin {
importProject() importProject()
with(facetSettings("js-module")) { with(facetSettings("js-module")) {
Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) Assert.assertTrue(platform.isJavaScript)
} }
val rootManager = ModuleRootManager.getInstance(getModule("js-module")) val rootManager = ModuleRootManager.getInstance(getModule("js-module"))
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32
+3 -3
View File
@@ -520,7 +520,7 @@ compileTestKotlin {
Assert.assertEquals("1.1", apiLevel!!.versionString) Assert.assertEquals("1.1", apiLevel!!.versionString)
Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) Assert.assertTrue(platform.isJavaScript)
with(compilerArguments as K2JSCompilerArguments) { with(compilerArguments as K2JSCompilerArguments) {
Assert.assertEquals(true, sourceMap) Assert.assertEquals(true, sourceMap)
Assert.assertEquals("plain", moduleKind) Assert.assertEquals("plain", moduleKind)
@@ -536,7 +536,7 @@ compileTestKotlin {
Assert.assertEquals("1.0", apiLevel!!.versionString) Assert.assertEquals("1.0", apiLevel!!.versionString)
Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion)
Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion)
Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) Assert.assertTrue(platform.isJavaScript)
with(compilerArguments as K2JSCompilerArguments) { with(compilerArguments as K2JSCompilerArguments) {
Assert.assertEquals(false, sourceMap) Assert.assertEquals(false, sourceMap)
Assert.assertEquals("umd", moduleKind) Assert.assertEquals("umd", moduleKind)
@@ -1210,7 +1210,7 @@ compileTestKotlin {
importProject() importProject()
with(facetSettings("js-module")) { with(facetSettings("js-module")) {
Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) Assert.assertTrue(platform.isJavaScript)
} }
val rootManager = ModuleRootManager.getInstance(getModule("js-module")) val rootManager = ModuleRootManager.getInstance(getModule("js-module"))