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

Revert usages of -X arguments to old form in some places

Browse Source 
We use the old compiler in Gradle build and in GradleFacetImportTest, so
some changes in f4b6db4 should not have been made yet
This commit is contained in:
Alexander Udalov
2017-04-17 11:33:58 +03:00
parent 072f87ddab
commit 10f2e9d33a
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
+8 -8
View File
@@ -61,13 +61,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
compileKotlin {
kotlinOptions.jvmTarget = "1.7"
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to=tmp"]
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
}
compileTestKotlin {
kotlinOptions.jvmTarget = "1.6"
kotlinOptions.apiVersion = "1.0"
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to=tmpTest"]
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
}
""")
importProject()
@@ -77,7 +77,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
Assert.assertEquals("1.1", apiLevel!!.versionString)
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_8], targetPlatformKind)
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
Assert.assertEquals("-Xdump-declarations-to=tmp -Xsingle-module",
Assert.assertEquals("-Xdump-declarations-to tmp -Xsingle-module",
compilerSettings!!.additionalArguments)
}
with (testFacetSettings) {
@@ -85,7 +85,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
Assert.assertEquals("1.0", apiLevel!!.versionString)
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6], targetPlatformKind)
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
Assert.assertEquals("-Xdump-declarations-to=tmpTest",
Assert.assertEquals("-Xdump-declarations-to tmpTest",
compilerSettings!!.additionalArguments)
}
}
@@ -130,13 +130,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
compileMyMainKotlin {
kotlinOptions.jvmTarget = "1.7"
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to=tmp"]
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
}
compileMyTestKotlin {
kotlinOptions.jvmTarget = "1.6"
kotlinOptions.apiVersion = "1.0"
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to=tmpTest"]
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
}
""")
importProject()
@@ -146,7 +146,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
Assert.assertEquals("1.1", apiLevel!!.versionString)
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_8], targetPlatformKind)
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
Assert.assertEquals("-Xdump-declarations-to=tmp -Xsingle-module",
Assert.assertEquals("-Xdump-declarations-to tmp -Xsingle-module",
compilerSettings!!.additionalArguments)
}
with (facetSettings("project_myTest")) {
@@ -154,7 +154,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
Assert.assertEquals("1.0", apiLevel!!.versionString)
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6], targetPlatformKind)
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
Assert.assertEquals("-Xdump-declarations-to=tmpTest",
Assert.assertEquals("-Xdump-declarations-to tmpTest",
compilerSettings!!.additionalArguments)
}
}