azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Add kotlinNativeFrameworkNameAttribute to fat frameworks as well

Browse Source 
^KT-58316 Verification Pending
This commit is contained in:
Anton Lakotka
2023-05-03 13:40:22 +02:00
committed by Space Team
parent ba3a3915c7
commit 7c5d1b4030
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/configureBinaryFrameworks.kt
+1 -1
View File
@@ -50,7 +50,6 @@ internal fun Project.createFrameworkArtifact(binaryFramework: Framework, linkTas
val frameworkConfiguration = configurations.getOrCreate(binaryFramework.binaryFrameworkConfigurationName, invokeWhenCreated = { val frameworkConfiguration = configurations.getOrCreate(binaryFramework.binaryFrameworkConfigurationName, invokeWhenCreated = {
it.markConsumable() it.markConsumable()
it.applyBinaryFrameworkGroupAttributes(project, binaryFramework.frameworkGroupDescription, listOf(binaryFramework.target)) it.applyBinaryFrameworkGroupAttributes(project, binaryFramework.frameworkGroupDescription, listOf(binaryFramework.target))
it.attributes.attribute(KotlinNativeTarget.kotlinNativeFrameworkNameAttribute, binaryFramework.baseName)
project.launchInStage(KotlinPluginLifecycle.Stage.FinaliseDsl) { project.launchInStage(KotlinPluginLifecycle.Stage.FinaliseDsl) {
copyAttributes(binaryFramework.attributes, it.attributes) copyAttributes(binaryFramework.attributes, it.attributes)
} }
@@ -85,6 +84,7 @@ private fun Configuration.applyBinaryFrameworkGroupAttributes(
attribute(KotlinPlatformType.attribute, KotlinPlatformType.native) attribute(KotlinPlatformType.attribute, KotlinPlatformType.native)
attribute(project.artifactTypeAttribute, KotlinNativeTargetConfigurator.NativeArtifactFormat.FRAMEWORK) attribute(project.artifactTypeAttribute, KotlinNativeTargetConfigurator.NativeArtifactFormat.FRAMEWORK)
attribute(KotlinNativeTarget.kotlinNativeBuildTypeAttribute, frameworkDescription.buildType.name) attribute(KotlinNativeTarget.kotlinNativeBuildTypeAttribute, frameworkDescription.buildType.name)
attribute(KotlinNativeTarget.kotlinNativeFrameworkNameAttribute, frameworkDescription.baseName)
attribute(Framework.frameworkTargets, targets.map { it.konanTarget.name }.toSet()) attribute(Framework.frameworkTargets, targets.map { it.konanTarget.name }.toSet())
} }
} }