From cae95b1ba0560a3f2cd190556945b3a1791f5998 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <Pavel.Punegov@jetbrains.com>
Date: Thu, 18 Mar 2021 14:41:03 +0000
Subject: [PATCH] [native] Fix kotlin.native.home properties order.

---
 .../src/main/kotlin/org/jetbrains/kotlin/Utils.kt    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
index fc817dc4d45..cbc77039874 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
@@ -91,23 +91,21 @@ fun Project.redirectIfEnabled(url: String):String = if (cacheRedirectorEnabled)
 } else
     url
 
-val validPropertiesNames = listOf("kotlin.native.home",
-                                  "org.jetbrains.kotlin.native.home",
-                                  "konan.home")
+val validPropertiesNames = listOf("konan.home",
+        "org.jetbrains.kotlin.native.home",
+        "kotlin.native.home")
 
 val Project.kotlinNativeDist
     get() = rootProject.currentKotlinNativeDist
 
 val Project.currentKotlinNativeDist
-    get() = file(validPropertiesNames.firstOrNull{ hasProperty(it) }?.let{ findProperty(it) } ?: "dist")
+    get() = file(validPropertiesNames.firstOrNull { hasProperty(it) }?.let { findProperty(it) } ?: "dist")
 
 val kotlinNativeHome
     get() = validPropertiesNames.mapNotNull(System::getProperty).first()
 
 val Project.useCustomDist
-    get() = hasProperty("kotlin.native.home") ||
-            hasProperty("org.jetbrains.kotlin.native.home") ||
-            hasProperty("konan.home")
+    get() = validPropertiesNames.any { hasProperty(it) }
 
 private val libraryRegexp = Regex("""^import\s+platform\.(\S+)\..*$""")
 fun File.dependencies() =