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

Fix CocoaPodsIT

Browse Source
This commit is contained in:
Philipp Smorygo
2021-09-01 01:39:11 +02:00
committed by Space
parent 90c88273c3
commit 6abd3bf589
1 changed files with 20 additions and 10 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/native/CocoaPodsIT.kt
+20 -10
View File
@@ -1424,21 +1424,26 @@ class CocoaPodsIT : BaseGradleIT() {
spec.module_name = "#{spec.name}_umbrella" spec.module_name = "#{spec.name}_umbrella"
spec.dependency 'pod_dependency', '1.0' spec.dependency 'pod_dependency', '1.0'
spec.dependency 'subspec_dependency/Core', '1.0' spec.dependency 'subspec_dependency/Core', '1.0'
spec.pod_target_xcconfig = {
'KOTLIN_PROJECT_PATH' => ':kotlin-library',
'PRODUCT_MODULE_NAME' => 'kotlin_library',
}
spec.script_phases = [ spec.script_phases = [
{ {
:name => 'Build kotlin_library', :name => 'Build kotlin_library',
:execution_position => :before_compile, :execution_position => :before_compile,
:shell_path => '/bin/sh', :shell_path => '/bin/sh',
:script => <<-SCRIPT :script => <<-SCRIPT
if [ "YES" = "${'$'}COCOAPODS_SKIP_KOTLIN_BUILD" ]; then
echo "Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\""
exit 0
fi
set -ev set -ev
REPO_ROOT="${'$'}PODS_TARGET_SRCROOT" REPO_ROOT="${'$'}PODS_TARGET_SRCROOT"
"${'$'}REPO_ROOT/../gradlew" -p "${'$'}REPO_ROOT" :kotlin-library:syncFramework \ "${'$'}REPO_ROOT/../gradlew" -p "${'$'}REPO_ROOT" ${'$'}KOTLIN_PROJECT_PATH:syncFramework \
-Pkotlin.native.cocoapods.platform=${'$'}PLATFORM_NAME \ -Pkotlin.native.cocoapods.platform=${'$'}PLATFORM_NAME \
-Pkotlin.native.cocoapods.archs="${'$'}ARCHS" \ -Pkotlin.native.cocoapods.archs="${'$'}ARCHS" \
-Pkotlin.native.cocoapods.configuration=${'$'}CONFIGURATION \ -Pkotlin.native.cocoapods.configuration=${'$'}CONFIGURATION
-Pkotlin.native.cocoapods.cflags="${'$'}OTHER_CFLAGS" \
-Pkotlin.native.cocoapods.paths.headers="${'$'}HEADER_SEARCH_PATHS" \
-Pkotlin.native.cocoapods.paths.frameworks="${'$'}FRAMEWORK_SEARCH_PATHS"
SCRIPT SCRIPT
} }
] ]
@@ -1457,21 +1462,26 @@ class CocoaPodsIT : BaseGradleIT() {
spec.vendored_frameworks = "build/cocoapods/framework/${frameworkName ?: "second_library"}.framework" spec.vendored_frameworks = "build/cocoapods/framework/${frameworkName ?: "second_library"}.framework"
spec.libraries = "c++" spec.libraries = "c++"
spec.module_name = "#{spec.name}_umbrella" spec.module_name = "#{spec.name}_umbrella"
spec.pod_target_xcconfig = {
'KOTLIN_PROJECT_PATH' => ':second-library',
'PRODUCT_MODULE_NAME' => 'second_library',
}
spec.script_phases = [ spec.script_phases = [
{ {
:name => 'Build second_library', :name => 'Build second_library',
:execution_position => :before_compile, :execution_position => :before_compile,
:shell_path => '/bin/sh', :shell_path => '/bin/sh',
:script => <<-SCRIPT :script => <<-SCRIPT
if [ "YES" = "${'$'}COCOAPODS_SKIP_KOTLIN_BUILD" ]; then
echo "Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\""
exit 0
fi
set -ev set -ev
REPO_ROOT="${'$'}PODS_TARGET_SRCROOT" REPO_ROOT="${'$'}PODS_TARGET_SRCROOT"
"${'$'}REPO_ROOT/../gradlew" -p "${'$'}REPO_ROOT" :second-library:syncFramework \ "${'$'}REPO_ROOT/../gradlew" -p "${'$'}REPO_ROOT" ${'$'}KOTLIN_PROJECT_PATH:syncFramework \
-Pkotlin.native.cocoapods.platform=${'$'}PLATFORM_NAME \ -Pkotlin.native.cocoapods.platform=${'$'}PLATFORM_NAME \
-Pkotlin.native.cocoapods.archs="${'$'}ARCHS" \ -Pkotlin.native.cocoapods.archs="${'$'}ARCHS" \
-Pkotlin.native.cocoapods.configuration=${'$'}CONFIGURATION \ -Pkotlin.native.cocoapods.configuration=${'$'}CONFIGURATION
-Pkotlin.native.cocoapods.cflags="${'$'}OTHER_CFLAGS" \
-Pkotlin.native.cocoapods.paths.headers="${'$'}HEADER_SEARCH_PATHS" \
-Pkotlin.native.cocoapods.paths.frameworks="${'$'}FRAMEWORK_SEARCH_PATHS"
SCRIPT SCRIPT
} }
] ]