From 17849473d6dc65f00d9da79295b3ff4cf3f1d3ac Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 5 Sep 2018 17:03:32 +0300 Subject: [PATCH] Fix bunch compilation for AS 3.1/3.2 --- .../idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 | 6 +++--- .../idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 index 7b6b83d7ebf..de840fa374d 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31 @@ -520,7 +520,7 @@ compileTestKotlin { Assert.assertEquals("1.1", apiLevel!!.versionString) Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion) - Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) + Assert.assertTrue(platform.isJavaScript) with(compilerArguments as K2JSCompilerArguments) { Assert.assertEquals(true, sourceMap) Assert.assertEquals("plain", moduleKind) @@ -536,7 +536,7 @@ compileTestKotlin { Assert.assertEquals("1.0", apiLevel!!.versionString) Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion) - Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) + Assert.assertTrue(platform.isJavaScript) with(compilerArguments as K2JSCompilerArguments) { Assert.assertEquals(false, sourceMap) Assert.assertEquals("umd", moduleKind) @@ -1210,7 +1210,7 @@ compileTestKotlin { importProject() with(facetSettings("js-module")) { - Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) + Assert.assertTrue(platform.isJavaScript) } val rootManager = ModuleRootManager.getInstance(getModule("js-module")) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 index 7b6b83d7ebf..de840fa374d 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32 @@ -520,7 +520,7 @@ compileTestKotlin { Assert.assertEquals("1.1", apiLevel!!.versionString) Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion) - Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) + Assert.assertTrue(platform.isJavaScript) with(compilerArguments as K2JSCompilerArguments) { Assert.assertEquals(true, sourceMap) Assert.assertEquals("plain", moduleKind) @@ -536,7 +536,7 @@ compileTestKotlin { Assert.assertEquals("1.0", apiLevel!!.versionString) Assert.assertFalse(compilerArguments!!.autoAdvanceLanguageVersion) Assert.assertFalse(compilerArguments!!.autoAdvanceApiVersion) - Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) + Assert.assertTrue(platform.isJavaScript) with(compilerArguments as K2JSCompilerArguments) { Assert.assertEquals(false, sourceMap) Assert.assertEquals("umd", moduleKind) @@ -1210,7 +1210,7 @@ compileTestKotlin { importProject() with(facetSettings("js-module")) { - Assert.assertEquals(TargetPlatformKind.JavaScript, targetPlatformKind) + Assert.assertTrue(platform.isJavaScript) } val rootManager = ModuleRootManager.getInstance(getModule("js-module"))