Merge pull request #62 from icerockdev/develop

Release 0.14.3

README.md

@@ -13,9 +13,9 @@ repositories {
 }
 
 dependencies {
- implementation("dev.icerock:mobile-multiplatform:0.14.2")
- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
- implementation("com.android.tools.build:gradle:7.0.4")
+ implementation("dev.icerock:mobile-multiplatform:0.14.3")
+ implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
+ implementation("com.android.tools.build:gradle:8.3.2")
 }
 ```
 

gradle/libs.versions.toml

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

src/main/kotlin/dev/icerock/gradle/AppleFrameworkPlugin.kt

@@ -4,14 +4,17 @@
 
 package dev.icerock.gradle
 
-import dev.icerock.gradle.tasks.SyncCocoaPodFrameworkTask
+import com.android.build.gradle.internal.tasks.factory.dependsOn
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.tasks.Exec
+import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
+import java.io.File
 
 open class AppleFrameworkPlugin : Plugin<Project> {
  override fun apply(target: Project) {
@@ -46,13 +49,24 @@ open class AppleFrameworkPlugin : Plugin<Project> {
  private fun configureSyncFrameworkTasks(
  framework: Framework
  ) {
- val linkTask: KotlinNativeLink = framework.linkTask
+ val linkTask: TaskProvider<out KotlinNativeLink> = framework.linkTaskProvider
  val syncTaskName: String = linkTask.name.replaceFirst("link", "sync")
+ val project: Project = framework.project
 
- framework.project.tasks.create(syncTaskName, SyncCocoaPodFrameworkTask::class.java) {
-  inputDir = framework.outputDirectory
+ val outputDir = File(project.buildDir, "cocoapods/framework")
+ val inputDir: File = framework.outputDirectory
 
- dependsOn(linkTask)
+ val syncTask: TaskProvider<Exec> = project.tasks.register(syncTaskName, Exec::class.java) {
+ group = "cocoapods"
+
+ commandLine("cp", "-R", inputDir.absolutePath, outputDir.absolutePath)
+
+ doFirst {
+ if (outputDir.exists()) {
+ outputDir.deleteRecursively()
+ }
+ }
  }
+ syncTask.dependsOn(linkTask)
  }
 }