From 7c5d1b4030bf0612f2efc31be9691c1d894f7083 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Wed, 3 May 2023 13:40:22 +0200 Subject: [PATCH] [Gradle] Add kotlinNativeFrameworkNameAttribute to fat frameworks as well ^KT-58316 Verification Pending --- .../kotlin/gradle/targets/native/configureBinaryFrameworks.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/configureBinaryFrameworks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/configureBinaryFrameworks.kt index bf172edb38e..24c3e953382 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/configureBinaryFrameworks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/configureBinaryFrameworks.kt @@ -50,7 +50,6 @@ internal fun Project.createFrameworkArtifact(binaryFramework: Framework, linkTas val frameworkConfiguration = configurations.getOrCreate(binaryFramework.binaryFrameworkConfigurationName, invokeWhenCreated = { it.markConsumable() it.applyBinaryFrameworkGroupAttributes(project, binaryFramework.frameworkGroupDescription, listOf(binaryFramework.target)) - it.attributes.attribute(KotlinNativeTarget.kotlinNativeFrameworkNameAttribute, binaryFramework.baseName) project.launchInStage(KotlinPluginLifecycle.Stage.FinaliseDsl) { copyAttributes(binaryFramework.attributes, it.attributes) } @@ -85,6 +84,7 @@ private fun Configuration.applyBinaryFrameworkGroupAttributes( attribute(KotlinPlatformType.attribute, KotlinPlatformType.native) attribute(project.artifactTypeAttribute, KotlinNativeTargetConfigurator.NativeArtifactFormat.FRAMEWORK) attribute(KotlinNativeTarget.kotlinNativeBuildTypeAttribute, frameworkDescription.buildType.name) + attribute(KotlinNativeTarget.kotlinNativeFrameworkNameAttribute, frameworkDescription.baseName) attribute(Framework.frameworkTargets, targets.map { it.konanTarget.name }.toSet()) } }