From 9bbfdb708ce52dcd223629d79179aafcaee6938c Mon Sep 17 00:00:00 2001 From: Artem Daugel-Dauge Date: Tue, 4 Jul 2023 13:52:47 +0200 Subject: [PATCH] [Gradle] Log reason why podInstall task is skipped ^KT-60050 Verification Pending --- .../kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt | 3 +++ .../targets/native/cocoapods/tasks/AbstractPodInstallTask.kt | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt index e6eb74c1bcd..a61c143a602 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt @@ -76,6 +76,9 @@ class CocoaPodsIT : KGPBaseTest() { buildWithCocoapodsWrapper(":kotlin-library:podImport") { podImportAsserts(subProject("kotlin-library").buildGradleKts, "kotlin-library") + if (gradleVersion >= GradleVersion.version(TestVersions.Gradle.G_7_6)) { + assertOutputContains("Podfile location is set") + } } buildWithCocoapodsWrapper(":second-library:podImport") { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/tasks/AbstractPodInstallTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/tasks/AbstractPodInstallTask.kt index e95a64bfd5c..d6610384e54 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/tasks/AbstractPodInstallTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/tasks/AbstractPodInstallTask.kt @@ -10,6 +10,7 @@ package org.jetbrains.kotlin.gradle.targets.native.tasks import org.gradle.api.provider.Property import org.gradle.api.provider.Provider import org.gradle.api.tasks.* +import org.jetbrains.kotlin.gradle.utils.onlyIfCompat import org.jetbrains.kotlin.gradle.utils.runCommand import java.io.File import java.io.IOException @@ -21,7 +22,7 @@ import java.io.IOException */ abstract class AbstractPodInstallTask : CocoapodsTask() { init { - onlyIf { podfile.isPresent } + onlyIfCompat("Podfile location is set") { podfile.isPresent } } @get:Optional