Skip to content

Commit f144f8b

Browse files
committed
[Gradle] Fix compilation error in CocoaPodsIT
Also add a Gradle version constraint for deprecation warnings suppressing KT-55972 Related
1 parent 2e7e162 commit f144f8b

File tree

1 file changed

+14
-8
lines changed
  • libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native

1 file changed

+14
-8
lines changed

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,13 +1094,16 @@ class CocoaPodsIT : BaseGradleIT() {
10941094
pod("SDWebImage/Core")
10951095
""".trimIndent())
10961096

1097+
val currentGradleVersion = chooseWrapperVersionOrFinishTest()
10971098
build(
10981099
":linkPodDebugFrameworkIOS",
10991100
"-Pkotlin.native.cocoapods.generate.wrapper=true",
1100-
options = defaultBuildOptions().copy(
1101-
// Workaround for KT-55751
1102-
warningMode = WarningMode.None,
1103-
)) {
1101+
options = defaultBuildOptions().suppressDeprecationWarningsSinceGradleVersion(
1102+
TestVersions.Gradle.G_7_4,
1103+
currentGradleVersion,
1104+
"Workaround for KT-55751"
1105+
)
1106+
) {
11041107
assertSuccessful()
11051108

11061109
assertTasksExecuted(":podBuildAFNetworkingIphonesimulator")
@@ -1137,13 +1140,16 @@ class CocoaPodsIT : BaseGradleIT() {
11371140
pod("AFNetworking") { linkOnly = true }
11381141
""".trimIndent())
11391142

1143+
val currentGradleVersion = chooseWrapperVersionOrFinishTest()
11401144
build(
11411145
":linkPodDebugFrameworkIOS",
11421146
"-Pkotlin.native.cocoapods.generate.wrapper=true",
1143-
options = defaultBuildOptions().copy(
1144-
// Workaround for KT-55751
1145-
warningMode = WarningMode.None,
1146-
)) {
1147+
options = defaultBuildOptions().suppressDeprecationWarningsSinceGradleVersion(
1148+
TestVersions.Gradle.G_7_4,
1149+
currentGradleVersion,
1150+
"Workaround for KT-55751"
1151+
)
1152+
) {
11471153
assertSuccessful()
11481154

11491155
assertContains("Dependency on 'AFNetworking' with option 'linkOnly=true' is unused for building static frameworks")

0 commit comments

Comments
 (0)