Perfect bootstrap task (#575)

Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Triple-T · May 18, 2019 · a96d22d · a96d22d
1 parent d12b69b
commit a96d22d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/plugin/src/main/kotlin/com/github/triplet/gradle/play/PlayPublisherPlugin.kt b/plugin/src/main/kotlin/com/github/triplet/gradle/play/PlayPublisherPlugin.kt
@@ -143,7 +143,7 @@ class PlayPublisherPlugin : Plugin<Project> {
             val playResourcesTask = project.newTask<GenerateResources>(
                     "generate${variantName}PlayResources",
                     constructorArgs = arrayOf(this)
-            )
+            ) { mustRunAfter(bootstrapTask) }
 
             val publishListingTask = project.newTask<PublishListing>(
                     "publish${variantName}Listing",

diff --git a/plugin/src/main/kotlin/com/github/triplet/gradle/play/tasks/Bootstrap.kt b/plugin/src/main/kotlin/com/github/triplet/gradle/play/tasks/Bootstrap.kt
@@ -52,6 +52,8 @@ open class Bootstrap @Inject constructor(
 
     @TaskAction
     fun bootstrap() {
+        project.delete(srcDir)
+
         val editId = getOrCreateEditId()
 
         val executor = project.serviceOf<WorkerExecutor>()
@@ -158,9 +160,9 @@ open class Bootstrap @Inject constructor(
                 val imageDir = File(p.dir, p.type.dirName).safeMkdirs()
 
                 println("Downloading ${p.language} listing graphics for type '$typeName'")
-                for (image in images) {
+                for ((i, image) in images.withIndex()) {
                     executor.submit(ImageDownloader::class) {
-                        params(ImageDownloader.Params(File(imageDir, "${image.id}.png"), image.url))
+                        params(ImageDownloader.Params(File(imageDir, "${i + 1}.png"), image.url))
                     }
                 }
             }