From 5b841a3af6c465c2080aadddfc756b549edf9b1d Mon Sep 17 00:00:00 2001 From: Artem Daugel-Dauge Date: Thu, 23 Feb 2023 19:49:47 +0100 Subject: [PATCH] [Gradle] Fix Gradle Native IT on x86 macos This includes a workaround for a cocoapods bug which was triggered by deprecation of AFNetworking and a fix of asserting on OS-specific command invocation. --- .../kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt | 4 +++- .../testProject/native-cocoapods-single/ios-app/Podfile | 2 +- 2 files changed, 4 insertions(+), 2 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 d497a208e15..8ae57ec91c2 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 @@ -948,7 +948,7 @@ class CocoaPodsIT : BaseGradleIT() { val framework = fileInWorkingDir("build/bin/iOS/podDebugFramework/cocoapods.framework/cocoapods") with(runProcess(listOf("file", framework.absolutePath), projectDir, environmentVariables = getEnvs())) { assertTrue(isSuccessful) - assertTrue(output.contains("current ar archive random library")) + kotlin.test.assertContains(output, "current ar archive") } } @@ -1264,6 +1264,8 @@ class CocoaPodsIT : BaseGradleIT() { val subprojectPodInstallTask = ":$subProjectName$podInstallTaskName" with(project) { preparePodfile("ios-app", ImportMode.FRAMEWORKS) + gradleBuildScript(subProjectName).appendToCocoapodsBlock("ios.deploymentTarget = \"14.0\"") + build(subprojectPodImportTask, "-Pkotlin.native.cocoapods.generate.wrapper=true") { assertTasksExecuted(listOf(subprojectPodspecTask, subprojectPodInstallTask)) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/Podfile b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/Podfile index a250a65d297..9bde3b530da 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/Podfile +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-single/ios-app/Podfile @@ -1,6 +1,6 @@ -platform :ios, '9.0' +platform :ios, '14.0' target 'ios-app' do pod 'pod_dependency', :path => '../pod_dependency'