From 021bbb1f829693a2f41b0cf86c52c5230740b23b Mon Sep 17 00:00:00 2001
From: Jelle De Coninck <jelle.de.coninck@guardsquare.com>
Date: Tue, 8 Jun 2021 15:10:01 +0200
Subject: [PATCH] Add task to create directory for aapt_rules.pro

---
 .../gradle/plugin/android/AndroidPlugin.kt     |  7 ++++++-
 .../PrepareProguardConfigDirectoryTask.kt      | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 gradle-plugin/src/main/kotlin/proguard/gradle/plugin/android/tasks/PrepareProguardConfigDirectoryTask.kt

diff --git a/gradle-plugin/src/main/kotlin/proguard/gradle/plugin/android/AndroidPlugin.kt b/gradle-plugin/src/main/kotlin/proguard/gradle/plugin/android/AndroidPlugin.kt
index d4244445..9bb0e016 100644
--- a/gradle-plugin/src/main/kotlin/proguard/gradle/plugin/android/AndroidPlugin.kt
+++ b/gradle-plugin/src/main/kotlin/proguard/gradle/plugin/android/AndroidPlugin.kt
@@ -26,6 +26,7 @@ import com.android.build.gradle.AppExtension
 import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.api.BaseVariant
+import com.android.build.gradle.internal.res.LinkApplicationAndroidResourcesTask
 import com.android.build.gradle.internal.tasks.factory.dependsOn
 import java.io.File
 import org.gradle.api.GradleException
@@ -43,6 +44,7 @@ import proguard.gradle.plugin.android.dsl.ProGuardConfiguration
 import proguard.gradle.plugin.android.dsl.UserProGuardConfiguration
 import proguard.gradle.plugin.android.dsl.VariantConfiguration
 import proguard.gradle.plugin.android.tasks.CollectConsumerRulesTask
+import proguard.gradle.plugin.android.tasks.PrepareProguardConfigDirectoryTask
 import proguard.gradle.plugin.android.transforms.AndroidConsumerRulesTransform
 import proguard.gradle.plugin.android.transforms.ArchiveConsumerRulesTransform
 
@@ -98,7 +100,10 @@ class AndroidPlugin(private val androidExtension: BaseExtension) : Plugin<Projec
     }
 
     private fun configureAapt(project: Project) {
-        File("${project.buildDir.absolutePath}/intermediates/proguard/configs").mkdirs()
+        val createDirectoryTask = project.tasks.register("prepareProguardConfigDirectory", PrepareProguardConfigDirectoryTask::class.java)
+        project.tasks.withType(LinkApplicationAndroidResourcesTask::class.java) {
+            it.dependsOn(createDirectoryTask)
+        }
         if (!androidExtension.aaptAdditionalParameters.contains("--proguard")) {
             androidExtension.aaptAdditionalParameters.addAll(listOf(
                     "--proguard",
diff --git a/gradle-plugin/src/main/kotlin/proguard/gradle/plugin/android/tasks/PrepareProguardConfigDirectoryTask.kt b/gradle-plugin/src/main/kotlin/proguard/gradle/plugin/android/tasks/PrepareProguardConfigDirectoryTask.kt
new file mode 100644
index 00000000..5ad77621
--- /dev/null
+++ b/gradle-plugin/src/main/kotlin/proguard/gradle/plugin/android/tasks/PrepareProguardConfigDirectoryTask.kt
@@ -0,0 +1,18 @@
+package proguard.gradle.plugin.android.tasks
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+import java.io.File
+
+abstract class PrepareProguardConfigDirectoryTask : DefaultTask() {
+
+    @OutputDirectory
+    val file = File("${project.buildDir.absolutePath}/intermediates/proguard/configs")
+
+    @TaskAction
+    fun createDirectory() {
+        file.mkdirs()
+    }
+}