From bec832d39f34cc3b2c8465aca733593f223b0f79 Mon Sep 17 00:00:00 2001
From: Andrey Yastrebov <andrey.yastrebov@jetbrains.com>
Date: Thu, 29 Feb 2024 10:10:02 +0100
Subject: [PATCH] KT-66225 Do not rewrite baseNameProvider in NativeBinary

---
 .../gradle/plugin/mpp/apple/swiftexport/SwiftExport.kt   | 2 +-
 .../kotlin/gradle/targets/native/NativeBinaries.kt       | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/swiftexport/SwiftExport.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/swiftexport/SwiftExport.kt
index ee9bcc7c05d..ca9cea15bca 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/swiftexport/SwiftExport.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/apple/swiftexport/SwiftExport.kt
@@ -30,7 +30,7 @@ fun Project.registerSwiftExportTask(
     framework: Framework,
 ): TaskProvider<*> {
     return registerSwiftExportTask(
-        swiftApiModuleName = provider { framework.baseName },
+        swiftApiModuleName = framework.baseNameProvider,
         target = framework.target,
         buildType = framework.buildType,
     )
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt
index 52380063c0b..aff46f5a9b4 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt
@@ -36,17 +36,12 @@ import java.io.File
  */
 sealed class NativeBinary(
     private val name: String,
-    baseNameProvided: String,
+    open var baseName: String,
     val buildType: NativeBuildType,
     @Transient
     var compilation: KotlinNativeCompilation
 ) : Named {
-    open var baseName: String
-        get() = baseNameProvider.get()
-        set(value) {
-            baseNameProvider = project.provider { value }
-        }
-    internal var baseNameProvider: Provider<String> = project.provider { baseNameProvided }
+    internal val baseNameProvider: Provider<String> = project.provider { baseName }
 
     internal val konanTarget: KonanTarget
         get() = compilation.konanTarget