Skip to content

Commit e06ebb7

Browse files
committed
fix cocoapods support with parallel compilation
1 parent ee0b877 commit e06ebb7

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repositories {
1313
}
1414

1515
dependencies {
16-
implementation("dev.icerock:mobile-multiplatform:0.13.0")
16+
implementation("dev.icerock:mobile-multiplatform:0.14.0")
1717
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
1818
implementation("com.android.tools.build:gradle:7.0.4")
1919
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
kotlinVersion = "1.6.10"
33
androidGradlePluginVerison = "7.0.4"
44
publishPluginVersion = "0.15.0"
5-
mobileMultiplatformGradlePluginVersion = "0.13.0"
5+
mobileMultiplatformGradlePluginVersion = "0.14.0"
66

77
[libraries]
88
androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePluginVerison" }

src/main/kotlin/dev/icerock/gradle/tasks/CompileCocoaPod.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ package dev.icerock.gradle.tasks
66

77
import dev.icerock.gradle.CocoaPodInfo
88
import dev.icerock.gradle.CocoapodsConfig
9+
import dev.icerock.gradle.LogOutputStream
910
import org.gradle.api.DefaultTask
11+
import org.gradle.api.logging.LogLevel
1012
import org.gradle.api.tasks.Input
1113
import org.gradle.api.tasks.InputDirectory
1214
import org.gradle.api.tasks.Internal
1315
import org.gradle.api.tasks.OutputDirectory
1416
import org.gradle.api.tasks.TaskAction
15-
import dev.icerock.gradle.LogOutputStream
16-
import org.gradle.api.logging.LogLevel
1717
import java.io.File
1818

1919
open class CompileCocoaPod : DefaultTask() {
@@ -49,7 +49,9 @@ open class CompileCocoaPod : DefaultTask() {
4949
val configuration: String
5050
get() = config.buildConfiguration
5151

52-
private val outputDir: File get() = File(project.buildDir, "cocoapods")
52+
private val cocoapodsDir: File get() = File(project.buildDir, "cocoapods")
53+
private val outputDir: File get() = File(cocoapodsDir, compileArch)
54+
private val derivedData: File get() = File(cocoapodsDir, "DerivedData")
5355

5456
@get:OutputDirectory
5557
val frameworksDir: File
@@ -58,17 +60,17 @@ open class CompileCocoaPod : DefaultTask() {
5860
@TaskAction
5961
fun compile() {
6062
val podsProjectPath = podsProject.absolutePath
61-
val podBuildDir = outputDir.absolutePath
62-
val derivedData = File(outputDir, "DerivedData").absolutePath
63+
val outputPath = outputDir.absolutePath
64+
val derivedDataPath = derivedData.absolutePath
6365
val cmdLine = arrayOf(
6466
"xcodebuild",
6567
"-project", podsProjectPath,
6668
"-scheme", scheme,
6769
"-sdk", compileSdk,
6870
"-arch", compileArch,
6971
"-configuration", configuration,
70-
"-derivedDataPath", derivedData,
71-
"SYMROOT=$podBuildDir",
72+
"-derivedDataPath", derivedDataPath,
73+
"SYMROOT=$outputPath",
7274
"DEPLOYMENT_LOCATION=YES",
7375
"SKIP_INSTALL=YES",
7476
"build"

0 commit comments

Comments
 (0)