From f144f8b6d31a1c7be972d4acf3edaedc84a2a3a3 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Mon, 23 Jan 2023 19:02:22 +0100 Subject: [PATCH] [Gradle] Fix compilation error in CocoaPodsIT Also add a Gradle version constraint for deprecation warnings suppressing KT-55972 Related --- .../kotlin/gradle/native/CocoaPodsIT.kt | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) 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 37a8754dfe8..0f07d712629 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 @@ -1094,13 +1094,16 @@ class CocoaPodsIT : BaseGradleIT() { pod("SDWebImage/Core") """.trimIndent()) + val currentGradleVersion = chooseWrapperVersionOrFinishTest() build( ":linkPodDebugFrameworkIOS", "-Pkotlin.native.cocoapods.generate.wrapper=true", - options = defaultBuildOptions().copy( - // Workaround for KT-55751 - warningMode = WarningMode.None, - )) { + options = defaultBuildOptions().suppressDeprecationWarningsSinceGradleVersion( + TestVersions.Gradle.G_7_4, + currentGradleVersion, + "Workaround for KT-55751" + ) + ) { assertSuccessful() assertTasksExecuted(":podBuildAFNetworkingIphonesimulator") @@ -1137,13 +1140,16 @@ class CocoaPodsIT : BaseGradleIT() { pod("AFNetworking") { linkOnly = true } """.trimIndent()) + val currentGradleVersion = chooseWrapperVersionOrFinishTest() build( ":linkPodDebugFrameworkIOS", "-Pkotlin.native.cocoapods.generate.wrapper=true", - options = defaultBuildOptions().copy( - // Workaround for KT-55751 - warningMode = WarningMode.None, - )) { + options = defaultBuildOptions().suppressDeprecationWarningsSinceGradleVersion( + TestVersions.Gradle.G_7_4, + currentGradleVersion, + "Workaround for KT-55751" + ) + ) { assertSuccessful() assertContains("Dependency on 'AFNetworking' with option 'linkOnly=true' is unused for building static frameworks")