From 8d7844316b9456d2c5796b41901d45e1bffaeb92 Mon Sep 17 00:00:00 2001
From: Dmitrii Krasnov <dmitrii.krasnov@jetbrains.com>
Date: Wed, 6 Mar 2024 16:05:38 +0100
Subject: [PATCH] [Gradle] Removed using rootProject from
 KonanPropertiesBuildService

^KT-64995 Fixed
---
 .../targets/native/KonanPropertiesBuildService.kt     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KonanPropertiesBuildService.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KonanPropertiesBuildService.kt
index 95ad8f22f85..19093233d1c 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KonanPropertiesBuildService.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KonanPropertiesBuildService.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.targets.native
 
 import org.gradle.api.Project
 import org.gradle.api.Task
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.services.BuildService
@@ -30,11 +31,11 @@ internal interface UsesKonanPropertiesBuildService : Task {
 abstract class KonanPropertiesBuildService : BuildService<KonanPropertiesBuildService.Parameters> {
 
     internal interface Parameters : BuildServiceParameters {
-        val konanHome: Property<String>
+        val konanHome: DirectoryProperty
     }
 
     private val properties: Properties by lazy {
-        Distribution(parameters.konanHome.get()).properties
+        Distribution(parameters.konanHome.get().asFile.absolutePath).properties
     }
 
     private val cacheableTargets: List<KonanTarget> by lazy {
@@ -62,14 +63,10 @@ abstract class KonanPropertiesBuildService : BuildService<KonanPropertiesBuildSe
     internal fun additionalCacheFlags(target: KonanTarget): List<String> =
         properties.resolvablePropertyList("additionalCacheFlags", target.visibleName)
 
-    internal val compilerVersion: String? by lazy {
-        properties["compilerVersion"]?.toString()
-    }
-
     companion object {
         fun registerIfAbsent(project: Project): Provider<KonanPropertiesBuildService> =
             project.gradle.sharedServices.registerIfAbsent(serviceName, KonanPropertiesBuildService::class.java) { service ->
-                service.parameters.konanHome.set(project.rootProject.konanHome.absolutePath)
+                service.parameters.konanHome.set(project.konanHome)
             }.also { serviceProvider ->
                 SingleActionPerProject.run(project, UsesKonanPropertiesBuildService::class.java.name) {
                     project.tasks.withType<UsesKonanPropertiesBuildService>().configureEach { task ->