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:
@@ -61,13 +61,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
|||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
kotlinOptions.jvmTarget = "1.7"
|
kotlinOptions.jvmTarget = "1.7"
|
||||||
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to=tmp"]
|
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
|
||||||
}
|
}
|
||||||
|
|
||||||
compileTestKotlin {
|
compileTestKotlin {
|
||||||
kotlinOptions.jvmTarget = "1.6"
|
kotlinOptions.jvmTarget = "1.6"
|
||||||
kotlinOptions.apiVersion = "1.0"
|
kotlinOptions.apiVersion = "1.0"
|
||||||
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to=tmpTest"]
|
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
|
||||||
}
|
}
|
||||||
""")
|
""")
|
||||||
importProject()
|
importProject()
|
||||||
@@ -77,7 +77,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
|||||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||||
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_8], targetPlatformKind)
|
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_8], targetPlatformKind)
|
||||||
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
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)
|
compilerSettings!!.additionalArguments)
|
||||||
}
|
}
|
||||||
with (testFacetSettings) {
|
with (testFacetSettings) {
|
||||||
@@ -85,7 +85,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
|||||||
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
||||||
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6], targetPlatformKind)
|
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6], targetPlatformKind)
|
||||||
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||||
Assert.assertEquals("-Xdump-declarations-to=tmpTest",
|
Assert.assertEquals("-Xdump-declarations-to tmpTest",
|
||||||
compilerSettings!!.additionalArguments)
|
compilerSettings!!.additionalArguments)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -130,13 +130,13 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
|||||||
|
|
||||||
compileMyMainKotlin {
|
compileMyMainKotlin {
|
||||||
kotlinOptions.jvmTarget = "1.7"
|
kotlinOptions.jvmTarget = "1.7"
|
||||||
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to=tmp"]
|
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
|
||||||
}
|
}
|
||||||
|
|
||||||
compileMyTestKotlin {
|
compileMyTestKotlin {
|
||||||
kotlinOptions.jvmTarget = "1.6"
|
kotlinOptions.jvmTarget = "1.6"
|
||||||
kotlinOptions.apiVersion = "1.0"
|
kotlinOptions.apiVersion = "1.0"
|
||||||
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to=tmpTest"]
|
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
|
||||||
}
|
}
|
||||||
""")
|
""")
|
||||||
importProject()
|
importProject()
|
||||||
@@ -146,7 +146,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
|||||||
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
Assert.assertEquals("1.1", apiLevel!!.versionString)
|
||||||
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_8], targetPlatformKind)
|
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_8], targetPlatformKind)
|
||||||
Assert.assertEquals("1.7", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
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)
|
compilerSettings!!.additionalArguments)
|
||||||
}
|
}
|
||||||
with (facetSettings("project_myTest")) {
|
with (facetSettings("project_myTest")) {
|
||||||
@@ -154,7 +154,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
|||||||
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
Assert.assertEquals("1.0", apiLevel!!.versionString)
|
||||||
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6], targetPlatformKind)
|
Assert.assertEquals(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6], targetPlatformKind)
|
||||||
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
Assert.assertEquals("1.6", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
|
||||||
Assert.assertEquals("-Xdump-declarations-to=tmpTest",
|
Assert.assertEquals("-Xdump-declarations-to tmpTest",
|
||||||
compilerSettings!!.additionalArguments)
|
compilerSettings!!.additionalArguments)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ compileBuiltinsKotlin {
|
|||||||
freeCompilerArgs = [
|
freeCompilerArgs = [
|
||||||
"-version",
|
"-version",
|
||||||
"-Xallow-kotlin-package",
|
"-Xallow-kotlin-package",
|
||||||
"-Xdump-declarations-to=${buildDir}/runtime-declarations.json",
|
"-Xdump-declarations-to", "${buildDir}/runtime-declarations.json",
|
||||||
"-cp", "${rootDir}/../dist/builtins",
|
"-cp", "${rootDir}/../dist/builtins",
|
||||||
"-module-name", "kotlin-runtime"
|
"-module-name", "kotlin-runtime"
|
||||||
]
|
]
|
||||||
@@ -113,7 +113,7 @@ compileKotlin {
|
|||||||
"-version",
|
"-version",
|
||||||
"-Xallow-kotlin-package",
|
"-Xallow-kotlin-package",
|
||||||
"-Xmultifile-parts-inherit",
|
"-Xmultifile-parts-inherit",
|
||||||
"-Xdump-declarations-to=${buildDir}/stdlib-declarations.json",
|
"-Xdump-declarations-to", "${buildDir}/stdlib-declarations.json",
|
||||||
"-module-name", project.name
|
"-module-name", project.name
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ compileKotlin {
|
|||||||
kotlinOptions.freeCompilerArgs = [
|
kotlinOptions.freeCompilerArgs = [
|
||||||
"-Xallow-kotlin-package",
|
"-Xallow-kotlin-package",
|
||||||
"-Xmultifile-parts-inherit",
|
"-Xmultifile-parts-inherit",
|
||||||
"-Xdump-declarations-to=${buildDir}/stdlib-jre7-declarations.json",
|
"-Xdump-declarations-to", "${buildDir}/stdlib-jre7-declarations.json",
|
||||||
"-module-name", project.name
|
"-module-name", project.name
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ compileKotlin {
|
|||||||
kotlinOptions.freeCompilerArgs = [
|
kotlinOptions.freeCompilerArgs = [
|
||||||
"-Xallow-kotlin-package",
|
"-Xallow-kotlin-package",
|
||||||
"-Xmultifile-parts-inherit",
|
"-Xmultifile-parts-inherit",
|
||||||
"-Xdump-declarations-to=${buildDir}/stdlib-jre8-declarations.json",
|
"-Xdump-declarations-to", "${buildDir}/stdlib-jre8-declarations.json",
|
||||||
"-module-name", project.name
|
"-module-name", project.name
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ sourceSets {
|
|||||||
|
|
||||||
compileTestKotlin {
|
compileTestKotlin {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
freeCompilerArgs = ["-Xdump-declarations-to=${buildDir}/cases-declarations.json"]
|
freeCompilerArgs = ['-Xdump-declarations-to', "${buildDir}/cases-declarations.json"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ class KotlinJvmOptionsTest {
|
|||||||
"-Xreport-perf",
|
"-Xreport-perf",
|
||||||
"-Xallow-kotlin-package",
|
"-Xallow-kotlin-package",
|
||||||
"-Xmultifile-parts-inherit",
|
"-Xmultifile-parts-inherit",
|
||||||
"-Xdump-declarations-to=declarationsPath",
|
"-Xdump-declarations-to", "declarationsPath",
|
||||||
"-script-templates", "a,b,c")
|
"-script-templates", "a,b,c")
|
||||||
|
|
||||||
val arguments = K2JVMCompilerArguments()
|
val arguments = K2JVMCompilerArguments()
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ compileKotlin {
|
|||||||
freeCompilerArgs = ["-version",
|
freeCompilerArgs = ["-version",
|
||||||
"-Xallow-kotlin-package",
|
"-Xallow-kotlin-package",
|
||||||
"-module-name", "kotlin-reflection",
|
"-module-name", "kotlin-reflection",
|
||||||
"-Xdump-declarations-to=${buildDir}/reflect-declarations.json"]
|
"-Xdump-declarations-to", "${buildDir}/reflect-declarations.json"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ compileKotlin {
|
|||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
freeCompilerArgs = [
|
freeCompilerArgs = [
|
||||||
"-Xallow-kotlin-package",
|
"-Xallow-kotlin-package",
|
||||||
"-Xdump-declarations-to=${buildDir}/runtime-declarations.json",
|
"-Xdump-declarations-to", "${buildDir}/runtime-declarations.json",
|
||||||
"-cp", "${rootDir}/../dist/builtins",
|
"-cp", "${rootDir}/../dist/builtins",
|
||||||
"-module-name", project.name
|
"-module-name", project.name
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user