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

Kotlin Facet: Fix facet creation with non-default JVM target

Browse Source 
Original commit: 18632c3200
This commit is contained in:
Alexey Sedunov
2017-04-04 21:11:29 +03:00
parent 24eae3367d
commit 55c4221d9f
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+11 -5
View File
@@ -132,14 +132,20 @@ class KotlinFacetSettings {
} }
} }
fun TargetPlatformKind<*>.createCompilerArguments(): CommonCompilerArguments { fun TargetPlatformKind<*>.createCompilerArguments(init: CommonCompilerArguments.() -> Unit = {}): CommonCompilerArguments {
return when (this) { val arguments = when (this) {
is TargetPlatformKind.Jvm -> { is TargetPlatformKind.Jvm -> K2JVMCompilerArguments()
K2JVMCompilerArguments().apply { jvmTarget = this@createCompilerArguments.version.description }
}
is TargetPlatformKind.JavaScript -> K2JSCompilerArguments() is TargetPlatformKind.JavaScript -> K2JSCompilerArguments()
is TargetPlatformKind.Common -> K2MetadataCompilerArguments() is TargetPlatformKind.Common -> K2MetadataCompilerArguments()
} }
arguments.init()
if (arguments is K2JVMCompilerArguments) {
arguments.jvmTarget = this@createCompilerArguments.version.description
}
return arguments
} }
interface KotlinFacetSettingsProvider { interface KotlinFacetSettingsProvider {