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

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
@@ -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)
}
}
+2 -2
View File
@@ -101,7 +101,7 @@ compileBuiltinsKotlin {
freeCompilerArgs = [
"-version",
"-Xallow-kotlin-package",
"-Xdump-declarations-to=${buildDir}/runtime-declarations.json",
"-Xdump-declarations-to", "${buildDir}/runtime-declarations.json",
"-cp", "${rootDir}/../dist/builtins",
"-module-name", "kotlin-runtime"
]
@@ -113,7 +113,7 @@ compileKotlin {
"-version",
"-Xallow-kotlin-package",
"-Xmultifile-parts-inherit",
"-Xdump-declarations-to=${buildDir}/stdlib-declarations.json",
"-Xdump-declarations-to", "${buildDir}/stdlib-declarations.json",
"-module-name", project.name
]
}
+1 -1
View File
@@ -48,7 +48,7 @@ compileKotlin {
kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
"-Xmultifile-parts-inherit",
"-Xdump-declarations-to=${buildDir}/stdlib-jre7-declarations.json",
"-Xdump-declarations-to", "${buildDir}/stdlib-jre7-declarations.json",
"-module-name", project.name
]
}
+1 -1
View File
@@ -50,7 +50,7 @@ compileKotlin {
kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
"-Xmultifile-parts-inherit",
"-Xdump-declarations-to=${buildDir}/stdlib-jre8-declarations.json",
"-Xdump-declarations-to", "${buildDir}/stdlib-jre8-declarations.json",
"-module-name", project.name
]
}
@@ -17,7 +17,7 @@ sourceSets {
compileTestKotlin {
kotlinOptions {
freeCompilerArgs = ["-Xdump-declarations-to=${buildDir}/cases-declarations.json"]
freeCompilerArgs = ['-Xdump-declarations-to', "${buildDir}/cases-declarations.json"]
}
}
@@ -12,7 +12,7 @@ class KotlinJvmOptionsTest {
"-Xreport-perf",
"-Xallow-kotlin-package",
"-Xmultifile-parts-inherit",
"-Xdump-declarations-to=declarationsPath",
"-Xdump-declarations-to", "declarationsPath",
"-script-templates", "a,b,c")
val arguments = K2JVMCompilerArguments()
+1 -1
View File
@@ -74,7 +74,7 @@ compileKotlin {
freeCompilerArgs = ["-version",
"-Xallow-kotlin-package",
"-module-name", "kotlin-reflection",
"-Xdump-declarations-to=${buildDir}/reflect-declarations.json"]
"-Xdump-declarations-to", "${buildDir}/reflect-declarations.json"]
}
}
+1 -1
View File
@@ -43,7 +43,7 @@ compileKotlin {
kotlinOptions {
freeCompilerArgs = [
"-Xallow-kotlin-package",
"-Xdump-declarations-to=${buildDir}/runtime-declarations.json",
"-Xdump-declarations-to", "${buildDir}/runtime-declarations.json",
"-cp", "${rootDir}/../dist/builtins",
"-module-name", project.name
]