From 717f4f0e1383f57de74f85e53dbaa7ab3ead3afb Mon Sep 17 00:00:00 2001 From: Artem Daugel-Dauge Date: Fri, 26 Apr 2024 15:58:43 +0200 Subject: [PATCH] [gradle] Don't create Kotlin binary's linkTask eagerly (#4707) It's better for the build performance, and it avoids uncovering the hidden CocoaPods plugin bug ([KT-67666](https://youtrack.jetbrains.com/issue/KT-67666)) Fixes https://github.com/JetBrains/compose-multiplatform/issues/4632 --- .../org/jetbrains/compose/resources/IosResources.kt | 2 +- .../test-projects/misc/iosResources/build.gradle.kts | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt index 3491fc739a..f950f48855 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt @@ -73,7 +73,7 @@ internal fun Project.configureSyncIosComposeResources( }) into(testExec.outputDirectory.resolve(IOS_COMPOSE_RESOURCES_ROOT_DIR)) } - testExec.linkTask.dependsOn(copyTestResourcesTask) + testExec.linkTaskProvider.dependsOn(copyTestResourcesTask) } } } diff --git a/gradle-plugins/compose/src/test/test-projects/misc/iosResources/build.gradle.kts b/gradle-plugins/compose/src/test/test-projects/misc/iosResources/build.gradle.kts index c2a2b0c400..daeacab621 100644 --- a/gradle-plugins/compose/src/test/test-projects/misc/iosResources/build.gradle.kts +++ b/gradle-plugins/compose/src/test/test-projects/misc/iosResources/build.gradle.kts @@ -5,20 +5,21 @@ plugins { } kotlin { - iosX64() - iosArm64() - iosSimulatorArm64() - cocoapods { version = "1.0" summary = "Some description for a Kotlin/Native module" homepage = "Link to a Kotlin/Native module homepage" + pod("Base64", "1.1.2") framework { baseName = "shared" isStatic = true } } + iosX64() + iosArm64() + iosSimulatorArm64() + sourceSets { commonMain { dependencies {