From 036f5ae0e0cf734077ce9063faff59a7a0a7bc56 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 10 Nov 2016 14:37:29 +0300 Subject: [PATCH] Minor, rename targetPlatformKindKind -> targetPlatformKind Original commit: d0f31a2bc2b02b717ceb587d59f898b558f2c181 --- .../kotlin/config/KotlinFacetSettings.kt | 22 +++---------------- .../kotlin/jps/JpsKotlinCompilerSettings.kt | 2 +- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 3fe3eac2f47..cd46c54c965 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -14,22 +14,6 @@ * limitations under the License. */ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package org.jetbrains.kotlin.config import com.intellij.openapi.components.ServiceManager @@ -69,13 +53,13 @@ object JSPlatform : TargetPlatformKind(NoVersion, "JavaScript") data class KotlinVersionInfo( var languageLevel: LanguageVersion? = null, var apiLevel: LanguageVersion? = null, - @get:Transient var targetPlatformKindKind: TargetPlatformKind<*>? = null + @get:Transient var targetPlatformKind: TargetPlatformKind<*>? = null ) { // To be serialized var targetPlatformName: String - get() = targetPlatformKindKind?.description ?: "" + get() = targetPlatformKind?.description ?: "" set(value) { - targetPlatformKindKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == value } + targetPlatformKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == value } } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index 0a50eb22998..d8031eb4999 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -78,7 +78,7 @@ class JpsKotlinCompilerSettings : JpsElementBase() { fun getK2JvmCompilerArguments(module: JpsModule): K2JVMCompilerArguments { val defaultArguments = getSettings(module.project).k2JvmCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments - val targetPlatform = facetSettings.versionInfo.targetPlatformKindKind as? JVMPlatform ?: return defaultArguments + val targetPlatform = facetSettings.versionInfo.targetPlatformKind as? JVMPlatform ?: return defaultArguments return copyBean(defaultArguments).apply { jvmTarget = targetPlatform.version.description }