[Gradle] Fix configuration cache issues for LinkFramework tasks

^KT-58261 Verification Pending
This commit is contained in:
Anton Lakotka
2023-04-25 18:46:02 +02:00
committed by Space Team
parent 96f8bcdf43
commit 2abe9ac1ef
3 changed files with 18 additions and 3 deletions
@@ -108,7 +108,13 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
":lib:compileTestKotlinIosX64", ":lib:compileTestKotlinIosX64",
":lib:linkDebugTestIosX64", ":lib:linkDebugTestIosX64",
":lib:transformCommonMainDependenciesMetadata", ":lib:transformCommonMainDependenciesMetadata",
":lib:transformCommonMainCInteropDependenciesMetadata" ":lib:transformCommonMainCInteropDependenciesMetadata",
":lib:linkDebugFrameworkIosArm64",
":lib:linkDebugFrameworkIosX64",
":lib:linkDebugFrameworkIosFat",
":lib:linkReleaseFrameworkIosArm64",
":lib:linkReleaseFrameworkIosX64",
":lib:linkReleaseFrameworkIosFat",
) )
} }
@@ -14,10 +14,18 @@ kotlin {
} }
iosX64 { iosX64 {
binaries { binaries {
//framework(namePrefix = "framework") framework {
baseName = "libFramework"
}
}
}
iosArm64 {
binaries {
framework {
baseName = "libFramework"
}
} }
} }
iosArm64()
iosSimulatorArm64() iosSimulatorArm64()
targets.filterIsInstance<KotlinNativeTarget>().forEach { targets.filterIsInstance<KotlinNativeTarget>().forEach {
@@ -269,6 +269,7 @@ class Framework(
compilation: KotlinNativeCompilation compilation: KotlinNativeCompilation
) : AbstractNativeLibrary(name, baseName, buildType, compilation), HasAttributes { ) : AbstractNativeLibrary(name, baseName, buildType, compilation), HasAttributes {
@Transient // Is required configuration cache support for KotlinNative tasks that capture whole binary object as task state
private val attributeContainer = HierarchyAttributeContainer(parent = compilation.attributes) private val attributeContainer = HierarchyAttributeContainer(parent = compilation.attributes)
override fun getAttributes() = attributeContainer override fun getAttributes() = attributeContainer