Skip to content

Commit 9f2364a

Browse files
Remove conanInstall task, keep only the four conanInstall-$ARCH tasks
1 parent 4361360 commit 9f2364a

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

src/main/kotlin/app/opendocument/ConanAndroidGradlePlugin.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ import org.gradle.api.Project
2727
class ConanAndroidGradlePlugin: Plugin<Project> {
2828
override fun apply(target: Project) {
2929
val tasks = target.tasks;
30-
val conanInstallAllArchesTask = tasks.register("conanInstall")
31-
tasks.named("preBuild").get().dependsOn(conanInstallAllArchesTask)
32-
target.parent?.tasks?.named("prepareKotlinBuildScriptModel")?.get()?.dependsOn(conanInstallAllArchesTask)
33-
30+
val preBuild = tasks.named("preBuild").get()
31+
val syncTask = target.parent?.tasks?.named("prepareKotlinBuildScriptModel")?.get()
3432
listOf("armv8", "armv7", "x86", "x86_64").forEach { architecture ->
3533
val conanInstallTask = tasks.register("conanInstall-$architecture", ConanInstallTask::class.java) { conanInstallTask ->
3634
conanInstallTask.arch.set(architecture)
@@ -42,7 +40,8 @@ class ConanAndroidGradlePlugin: Plugin<Project> {
4240
conanInstallTask.dependsOn(tasks.named("conanInstall-armv8"))
4341
}
4442
}
45-
conanInstallAllArchesTask.get().dependsOn(conanInstallTask)
43+
preBuild.dependsOn(conanInstallTask)
44+
syncTask?.dependsOn(conanInstallTask)
4645
}
4746
}
4847
}

0 commit comments

Comments
 (0)