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

Slightly improve Kotlin library podspec

Browse Source 
Add additional parameters to Podspec for clarity.
Add ability to skip building by using an environment variable
This commit is contained in:
Philipp Smorygo
2021-06-17 15:45:43 +02:00
committed by teamcityserver
parent db61665ab8
commit 54b9ad6bf5
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt
+10 -2
View File
@@ -102,7 +102,6 @@ open class PodspecTask : DefaultTask() {
} }
val gradleCommand = "\$REPO_ROOT/${gradleWrapper.toRelativeString(project.projectDir)}" val gradleCommand = "\$REPO_ROOT/${gradleWrapper.toRelativeString(project.projectDir)}"
val syncTask = "${project.path}:$SYNC_TASK_NAME"
val deploymentTargets = run { val deploymentTargets = run {
listOf(ios, osx, tvos, watchos).map { it.get() }.filter { it.deploymentTarget != null }.joinToString("\n") { listOf(ios, osx, tvos, watchos).map { it.get() }.filter { it.deploymentTarget != null }.joinToString("\n") {
@@ -130,15 +129,24 @@ open class PodspecTask : DefaultTask() {
| |
$dependencies $dependencies
| |
| spec.pod_target_xcconfig = {
| 'KOTLIN_PROJECT_PATH' => '${project.path}',
| 'PRODUCT_MODULE_NAME' => '$specName',
| }
|
| spec.script_phases = [ | spec.script_phases = [
| { | {
| :name => 'Build $specName', | :name => 'Build $specName',
| :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"
| "$gradleCommand" -p "${'$'}REPO_ROOT" $syncTask \ | "$gradleCommand" -p "${'$'}REPO_ROOT" ${'$'}KOTLIN_PROJECT_PATH:$SYNC_TASK_NAME \
| -P${KotlinCocoapodsPlugin.PLATFORM_PROPERTY}=${'$'}PLATFORM_NAME \ | -P${KotlinCocoapodsPlugin.PLATFORM_PROPERTY}=${'$'}PLATFORM_NAME \
| -P${KotlinCocoapodsPlugin.ARCHS_PROPERTY}="${'$'}ARCHS" \ | -P${KotlinCocoapodsPlugin.ARCHS_PROPERTY}="${'$'}ARCHS" \
| -P${KotlinCocoapodsPlugin.CONFIGURATION_PROPERTY}=${'$'}CONFIGURATION \ | -P${KotlinCocoapodsPlugin.CONFIGURATION_PROPERTY}=${'$'}CONFIGURATION \