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

Fix org.jetbrains.kotlin.native.disabledTargets registered as extension

Browse Source 
Do not register an extension, use an extra property instead. This way,
it is less visible for a build author.

Hotfix for commit c292380aff
Issue #KT-29693
This commit is contained in:
Sergey Igushkin
2019-07-10 21:12:23 +03:00
parent 26a8c16166
commit 0aa80d1912
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/DisabledNativeTargetsReporter.kt
+6 -5
View File
@@ -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<DisabledTarget>())
project.rootProject.extensions.getByType(ExtraPropertiesExtension::class.java).run {
if (!has(EXTRA_PROPERTY_NAME)) {
set(EXTRA_PROPERTY_NAME, mutableListOf<DisabledTarget>())
printWarningWhenTaskGraphIsReady(project)
}
getByName(EXTENSION_NAME)
get(EXTRA_PROPERTY_NAME)
} as MutableList<DisabledTarget>
private fun printWarningWhenTaskGraphIsReady(project: Project) {