Merge pull request #58 from icerockdev/develop

Release 0.14.0

Author: Alex009

README.md

@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.13.0")
+    implementation("dev.icerock:mobile-multiplatform:0.14.0")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
     implementation("com.android.tools.build:gradle:7.0.4")
 }

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 kotlinVersion = "1.6.10"
 androidGradlePluginVerison = "7.0.4"
 publishPluginVersion = "0.15.0"
-mobileMultiplatformGradlePluginVersion = "0.13.0"
+mobileMultiplatformGradlePluginVersion = "0.14.0"
 
 [libraries]
 androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePluginVerison" }

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

@@ -6,14 +6,14 @@ package dev.icerock.gradle.tasks
 
 import dev.icerock.gradle.CocoaPodInfo
 import dev.icerock.gradle.CocoapodsConfig
+import dev.icerock.gradle.LogOutputStream
 import org.gradle.api.DefaultTask
+import org.gradle.api.logging.LogLevel
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
-import dev.icerock.gradle.LogOutputStream
-import org.gradle.api.logging.LogLevel
 import java.io.File
 
 open class CompileCocoaPod : DefaultTask() {
@@ -49,7 +49,9 @@ open class CompileCocoaPod : DefaultTask() {
     val configuration: String
         get() = config.buildConfiguration
 
-    private val outputDir: File get() = File(project.buildDir, "cocoapods")
+    private val cocoapodsDir: File get() = File(project.buildDir, "cocoapods")
+    private val outputDir: File get() = File(cocoapodsDir, compileArch)
+    private val derivedData: File get() = File(cocoapodsDir, "DerivedData")
 
     @get:OutputDirectory
     val frameworksDir: File
@@ -58,17 +60,17 @@ open class CompileCocoaPod : DefaultTask() {
     @TaskAction
     fun compile() {
         val podsProjectPath = podsProject.absolutePath
-        val podBuildDir = outputDir.absolutePath
-        val derivedData = File(outputDir, "DerivedData").absolutePath
+        val outputPath = outputDir.absolutePath
+        val derivedDataPath = derivedData.absolutePath
         val cmdLine = arrayOf(
             "xcodebuild",
             "-project", podsProjectPath,
             "-scheme", scheme,
             "-sdk", compileSdk,
             "-arch", compileArch,
             "-configuration", configuration,
-            "-derivedDataPath", derivedData,
-            "SYMROOT=$podBuildDir",
+            "-derivedDataPath", derivedDataPath,
+            "SYMROOT=$outputPath",
             "DEPLOYMENT_LOCATION=YES",
             "SKIP_INSTALL=YES",
             "build"