azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Tests] Try to make CocoaPods installation more robus once againt

Browse Source
This commit is contained in:
Artem Daugel-Dauge
2023-06-23 16:35:41 +02:00
committed by Space Team
parent 4d9f93e4eb
commit 7eec1b350f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/cocoapodsTestHelpers.kt
+2 -1
View File
@@ -166,6 +166,7 @@ fun cocoaPodsEnvironmentVariables(): Map<String, String> {
* *
* @throws AssertionError if [shouldInstallLocalCocoapods] is false and cocoapods has not been installed * @throws AssertionError if [shouldInstallLocalCocoapods] is false and cocoapods has not been installed
*/ */
@Synchronized
fun ensureCocoapodsInstalled() { fun ensureCocoapodsInstalled() {
if (shouldInstallLocalCocoapods) { if (shouldInstallLocalCocoapods) {
val installDir = cocoapodsInstallationRoot.absolutePathString() val installDir = cocoapodsInstallationRoot.absolutePathString()
@@ -174,7 +175,7 @@ fun ensureCocoapodsInstalled() {
try { try {
//https://github.com/ffi/ffi/issues/864#issuecomment-875242776 //https://github.com/ffi/ffi/issues/864#issuecomment-875242776
gem("install", "--install-dir", installDir, "ffi", "-v", "1.15.5", "--", "--enable-libffi-alloc") gem("install", "--install-dir", installDir, "ffi", "-v", "1.15.5", "--", "--enable-libffi-alloc")
} catch (e: Exception) { } catch (e: AssertionError) {
System.err.println("ffi installation with '--enable-libffi-alloc' has failed but we'll try to continue with a default ffi") System.err.println("ffi installation with '--enable-libffi-alloc' has failed but we'll try to continue with a default ffi")
System.err.println(e.toString()) System.err.println(e.toString())
} }