From 2aa8601f93e6e2d3a37a3746d298fa0ba3958fbf Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Wed, 25 Mar 2020 15:47:56 +0700 Subject: [PATCH] Minor. Comments added --- idea/kotlin-gradle-tooling/src/KotlinMPPGradleModel.kt | 2 +- idea/kotlin-gradle-tooling/src/KotlinNativeHomeEvaluator.kt | 1 + .../kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModel.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModel.kt index a946418367d..a0b2651d79d 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModel.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModel.kt @@ -148,7 +148,7 @@ interface KotlinTarget : Serializable { val compilations: Collection val testTasks: Collection val jar: KotlinTargetJar? - val konanArtifacts: List // TODO: move K/N artifacts under KotlinNativeCompilationExtensions + val konanArtifacts: List companion object { const val METADATA_TARGET_NAME = "metadata" diff --git a/idea/kotlin-gradle-tooling/src/KotlinNativeHomeEvaluator.kt b/idea/kotlin-gradle-tooling/src/KotlinNativeHomeEvaluator.kt index 8bf01e49a7f..807e3efc7f0 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinNativeHomeEvaluator.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinNativeHomeEvaluator.kt @@ -9,6 +9,7 @@ import org.gradle.api.Project // KT-29613, KT-29783 object KotlinNativeHomeEvaluator { + // this property is defined in org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset private const val KOTLIN_NATIVE_HOME_PRIVATE_PROPERTY = "konanHome" private const val FALLBACK_ACCESSOR_CLASS = "org.jetbrains.kotlin.compilerRunner.KotlinNativeToolRunnerKt" diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt index 5ea91180d14..96377765749 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetPreset.kt @@ -33,7 +33,7 @@ abstract class AbstractKotlinNativeTargetPreset( ) : KotlinTargetPreset { init { - // This is required to obtain Kotlin/Native home in CLion plugin: + // This is required to obtain Kotlin/Native home in IDE plugin: setupNativeHomePrivateProperty() }