Rename platform to targetPlatform in KotlinFacetSettings to avoid ambiguity in Java

This commit is contained in:
Dmitry Savvinov
2019-05-28 15:43:23 +03:00
parent 6ff5dc179c
commit aeb7f8400a
16 changed files with 78 additions and 92 deletions
@@ -189,7 +189,7 @@ class KotlinFacetSettings {
compilerArguments!!.apiVersion = value?.versionString
}
val platform: TargetPlatform?
val targetPlatform: TargetPlatform?
get() {
val compilerArguments = this.compilerArguments ?: return null
return IdePlatformKind.platformByCompilerArguments(compilerArguments)
@@ -202,7 +202,7 @@ class KotlinFacetSettings {
level = DeprecationLevel.ERROR
)
fun getPlatform(): org.jetbrains.kotlin.platform.IdePlatform<*, *>? {
return platform?.toIdePlatform()
return targetPlatform?.toIdePlatform()
}
var coroutineSupport: LanguageFeature.State?
@@ -35,7 +35,6 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatform
import org.jetbrains.kotlin.platform.konan.KonanPlatform
import org.jetbrains.kotlin.platform.oldFashionedDescription
import org.jetbrains.kotlin.platform.orDefault
import org.jetbrains.kotlin.resolve.*
import java.lang.reflect.Modifier
import kotlin.reflect.KClass
import kotlin.reflect.full.superclasses
@@ -288,7 +287,7 @@ private fun buildChildElement(element: Element, tag: String, bean: Any, filter:
private fun KotlinFacetSettings.writeLatestConfig(element: Element) {
val filter = SkipDefaultsSerializationFilter()
platform?.let {
targetPlatform?.let {
element.setAttribute("platform", it.oldFashionedDescription)
}
if (!useProjectSettings) {