From c0c056457cfdc3835253b41df2da6f7f08df7f3f Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@jetbrains.com>
Date: Wed, 11 Dec 2019 18:34:32 +0300
Subject: [PATCH] Clenup targets usage

---
 backend.native/tests/build.gradle                    |  6 +++---
 .../main/kotlin/org/jetbrains/kotlin/CoverageTest.kt |  4 ++--
 .../main/kotlin/org/jetbrains/kotlin/PlatformInfo.kt |  4 ++--
 .../src/main/kotlin/org/jetbrains/kotlin/Utils.kt    | 12 ++++--------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 3c2ce4608b7..3ae244ed8e0 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -317,8 +317,8 @@ def createTestTasks(File testRoot, Class<Task> taskType, Closure taskConfigurati
 
 void dependsOnPlatformLibs(Task t) {
     if (!useCustomDist) {
-        def testTarget = project.testTarget
-        if (testTarget != null && testTarget != project.hostName) {
+        def testTarget = project.target
+        if (testTarget != project.platformManager.Companion.host) {
             t.dependsOn(":${testTarget}PlatformLibs")
         } else {
             t.dependsOn(':distPlatformLibs')
@@ -3909,7 +3909,7 @@ KotlinNativeTestKt.createTest(project, 'harmonyRegexTest', KonanGTest) { task ->
     task.finalizedBy("resultsTask")
 }
 
-if (UtilsKt.testTargetSupportsCodeCoverage(project)) {
+if (UtilsKt.getTestTargetSupportsCodeCoverage(project)) {
     task coverage_basic_program(type: CoverageTest) {
 
         binaryName = "CoverageBasic"
diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/CoverageTest.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/CoverageTest.kt
index e0b764d2e3b..76bf0c44b53 100644
--- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/CoverageTest.kt
+++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/CoverageTest.kt
@@ -28,8 +28,8 @@ import org.gradle.api.tasks.TaskAction
  */
 open class CoverageTest : DefaultTask() {
 
-    private val target = project.testTarget()
-    private val platform = project.platformManager().platform(target)
+    private val target = project.testTarget
+    private val platform = project.platformManager.platform(target)
     private val llvmBin = "${platform.configurables.absoluteLlvmHome}/bin"
 
     @Input
diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/PlatformInfo.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/PlatformInfo.kt
index 4d77f67f85b..cbd63cc1a8a 100644
--- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/PlatformInfo.kt
+++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/PlatformInfo.kt
@@ -32,8 +32,8 @@ object PlatformInfo {
 
     @JvmStatic
     fun getTarget(project: Project): KonanTarget {
-        val platformManager = project.rootProject.platformManager()
-        val targetName = project.project.testTarget().name
+        val platformManager = project.rootProject.platformManager
+        val targetName = project.project.testTarget.name
         return platformManager.targetManager(targetName).target
     }
 
diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
index 45507d13597..9796e4bb7b1 100644
--- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
+++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt
@@ -52,15 +52,11 @@ val Project.globalTestArgs: List<String>
             else this as List<String>
     }
 
+val Project.testTargetSupportsCodeCoverage: Boolean
+    get() = this.testTarget.supportsCodeCoverage()
+
 //endregion
 
-
-fun Project.platformManager() = findProperty("platformManager") as PlatformManager
-fun Project.testTarget() = findProperty("target") as KonanTarget
-
-fun Project.testTargetSupportsCodeCoverage(): Boolean =
-        this.testTarget.supportsCodeCoverage()
-
 /**
  * Ad-hoc signing of the specified path.
  */
@@ -214,7 +210,7 @@ fun getBuildProperty(buildJsonDescription: String, property: String) =
 @JvmOverloads
 fun compileSwift(project: Project, target: KonanTarget, sources: List<String>, options: List<String>,
                  output: Path, fullBitcode: Boolean = false) {
-    val platform = project.platformManager().platform(target)
+    val platform = project.platformManager.platform(target)
     assert(platform.configurables is AppleConfigurables)
     val configs = platform.configurables as AppleConfigurables
     val compiler = configs.absoluteTargetToolchain + "/usr/bin/swiftc"