[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.
This commit is contained in:
committed by
Space Team
parent
72823657c9
commit
5b841a3af6
+3
-1
@@ -948,7 +948,7 @@ class CocoaPodsIT : BaseGradleIT() {
|
|||||||
val framework = fileInWorkingDir("build/bin/iOS/podDebugFramework/cocoapods.framework/cocoapods")
|
val framework = fileInWorkingDir("build/bin/iOS/podDebugFramework/cocoapods.framework/cocoapods")
|
||||||
with(runProcess(listOf("file", framework.absolutePath), projectDir, environmentVariables = getEnvs())) {
|
with(runProcess(listOf("file", framework.absolutePath), projectDir, environmentVariables = getEnvs())) {
|
||||||
assertTrue(isSuccessful)
|
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"
|
val subprojectPodInstallTask = ":$subProjectName$podInstallTaskName"
|
||||||
with(project) {
|
with(project) {
|
||||||
preparePodfile("ios-app", ImportMode.FRAMEWORKS)
|
preparePodfile("ios-app", ImportMode.FRAMEWORKS)
|
||||||
|
gradleBuildScript(subProjectName).appendToCocoapodsBlock("ios.deploymentTarget = \"14.0\"")
|
||||||
|
|
||||||
build(subprojectPodImportTask, "-Pkotlin.native.cocoapods.generate.wrapper=true") {
|
build(subprojectPodImportTask, "-Pkotlin.native.cocoapods.generate.wrapper=true") {
|
||||||
assertTasksExecuted(listOf(subprojectPodspecTask, subprojectPodInstallTask))
|
assertTasksExecuted(listOf(subprojectPodspecTask, subprojectPodInstallTask))
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
<import_mode_directive>
|
<import_mode_directive>
|
||||||
|
|
||||||
platform :ios, '9.0'
|
platform :ios, '14.0'
|
||||||
|
|
||||||
target 'ios-app' do
|
target 'ios-app' do
|
||||||
pod 'pod_dependency', :path => '../pod_dependency'
|
pod 'pod_dependency', :path => '../pod_dependency'
|
||||||
|
|||||||
Reference in New Issue
Block a user