Remove preBuild dependency on buildTask (BrainiumLLC#47)

* Remove preBuild dependency on buildTask * ensure that preBuild runs after the Rust build tasks.
arasan01 · Oct 26, 2021 · b85b13c · b85b13c
1 parent fe8b064
commit b85b13c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/templates/platforms/android-studio/buildSrc/src/main/kotlin/RustPlugin.kt.hbs b/templates/platforms/android-studio/buildSrc/src/main/kotlin/RustPlugin.kt.hbs
@@ -32,17 +32,18 @@ open class RustPlugin : Plugin<Project> {
  group = TASK_GROUP
  description = "Build dynamic library in ${profile} mode for all targets"
  }
- project.tasks.findByName("preBuild")?.dependsOn(buildTask)
  for (targetPair in config.targets!!.withIndex()) {
  val targetName = targetPair.value
  val targetArch = config.arches!![targetPair.index]
- buildTask.dependsOn(project.tasks.maybeCreate("rustBuild${targetArch.capitalize()}${profile.capitalize()}", BuildTask::class.java).apply {
+ val targetBuildTask = project.tasks.maybeCreate("rustBuild${targetArch.capitalize()}${profile.capitalize()}", BuildTask::class.java).apply {
  group = TASK_GROUP
  description = "Build dynamic library in ${profile} mode for $targetArch"
  rootDirRel = File(config.rootDirRel)
  target = targetName
  release = profile == "release"
- })
+ }
+ buildTask.dependsOn(targetBuildTask)
+ project.tasks.findByName("preBuild")?.mustRunAfter(targetBuildTask)
  }
  }
  }