Skip to content

Commit

Permalink
Merge pull request #59 from icerockdev/develop
Browse files Browse the repository at this point in the history
Release 0.14.1
  • Loading branch information
Alex009 authored Mar 6, 2022
2 parents 40314e6 + c84af29 commit 5fa7844
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repositories {
}

dependencies {
implementation("dev.icerock:mobile-multiplatform:0.14.0")
implementation("dev.icerock:mobile-multiplatform:0.14.1")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
implementation("com.android.tools.build:gradle:7.0.4")
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
kotlinVersion = "1.6.10"
androidGradlePluginVerison = "7.0.4"
publishPluginVersion = "0.15.0"
mobileMultiplatformGradlePluginVersion = "0.14.0"
mobileMultiplatformGradlePluginVersion = "0.14.1"

[libraries]
androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePluginVerison" }
Expand Down
13 changes: 7 additions & 6 deletions src/main/kotlin/dev/icerock/gradle/CocoapodsPlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,6 @@ class CocoapodsPlugin : Plugin<Project> {
)
}
}

val rootProjectPath = target.rootProject.buildDir.absolutePath
val frameworksPath = "$rootProjectPath/cocoapods/UninstalledProducts/iphonesimulator"
target.tasks.withType(KotlinNativeTest::class).all {
environment("SIMCTL_CHILD_DYLD_FRAMEWORK_PATH", frameworksPath)
}
}
}

Expand All @@ -108,6 +102,13 @@ class CocoapodsPlugin : Plugin<Project> {

linkTask.dependsOn(buildTask)
}

project.tasks
.withType(KotlinNativeTest::class)
.matching { it.targetName == target.name }
.configureEach {
environment("SIMCTL_CHILD_DYLD_FRAMEWORK_PATH", frameworksDir.absolutePath)
}
}

private fun configurePodCompilation(
Expand Down

0 comments on commit 5fa7844

Please sign in to comment.