diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/DisabledNativeTargetsReporter.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/DisabledNativeTargetsReporter.kt index f0d4e7f5f17..fd0fa3fd12a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/DisabledNativeTargetsReporter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/DisabledNativeTargetsReporter.kt @@ -6,12 +6,13 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.gradle.api.Project +import org.gradle.api.plugins.ExtraPropertiesExtension import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.KonanTarget internal object DisabledNativeTargetsReporter { - private const val EXTENSION_NAME = "org.jetbrains.kotlin.native.disabledTargets" + private const val EXTRA_PROPERTY_NAME = "org.jetbrains.kotlin.native.disabledTargets" internal const val WARNING_PREFIX = "Some Kotlin/Native targets cannot be built on this " @@ -26,12 +27,12 @@ internal object DisabledNativeTargetsReporter { @Suppress("UNCHECKED_CAST") private fun getOrRegisterDisabledTargets(project: Project) = - project.rootProject.extensions.run { - if (findByName(EXTENSION_NAME) == null) { - add(EXTENSION_NAME, mutableListOf()) + project.rootProject.extensions.getByType(ExtraPropertiesExtension::class.java).run { + if (!has(EXTRA_PROPERTY_NAME)) { + set(EXTRA_PROPERTY_NAME, mutableListOf()) printWarningWhenTaskGraphIsReady(project) } - getByName(EXTENSION_NAME) + get(EXTRA_PROPERTY_NAME) } as MutableList private fun printWarningWhenTaskGraphIsReady(project: Project) {