diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt index dc207598bb1..57d1a935996 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt @@ -108,7 +108,13 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { ":lib:compileTestKotlinIosX64", ":lib:linkDebugTestIosX64", ":lib:transformCommonMainDependenciesMetadata", - ":lib:transformCommonMainCInteropDependenciesMetadata" + ":lib:transformCommonMainCInteropDependenciesMetadata", + ":lib:linkDebugFrameworkIosArm64", + ":lib:linkDebugFrameworkIosX64", + ":lib:linkDebugFrameworkIosFat", + ":lib:linkReleaseFrameworkIosArm64", + ":lib:linkReleaseFrameworkIosX64", + ":lib:linkReleaseFrameworkIosFat", ) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-configuration-cache/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-configuration-cache/lib/build.gradle.kts index 82d6defcd2f..beb4604e367 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-configuration-cache/lib/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-configuration-cache/lib/build.gradle.kts @@ -14,10 +14,18 @@ kotlin { } iosX64 { binaries { - //framework(namePrefix = "framework") + framework { + baseName = "libFramework" + } + } + } + iosArm64 { + binaries { + framework { + baseName = "libFramework" + } } } - iosArm64() iosSimulatorArm64() targets.filterIsInstance().forEach { 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 00077d81f2e..b9dbb75c02d 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 @@ -269,6 +269,7 @@ class Framework( compilation: KotlinNativeCompilation ) : 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) override fun getAttributes() = attributeContainer