From 0aa80d1912a83505c834344858ad130486231e98 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Wed, 10 Jul 2019 21:12:23 +0300
Subject: [PATCH] Fix org.jetbrains.kotlin.native.disabledTargets registered as
 extension

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

Hotfix for commit c292380aff136a8dff856b719187b528d254c147
Issue #KT-29693
---
 .../targets/native/DisabledNativeTargetsReporter.kt   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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<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) {