Loading and initializing variant processor earlier

didi · Jul 16, 2022 · c81fdb2 · c81fdb2
1 parent 5f7de66
commit c81fdb2
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/booster-gradle-plugin/src/main/kotlin/com/didiglobal/booster/gradle/BoosterPlugin.kt b/booster-gradle-plugin/src/main/kotlin/com/didiglobal/booster/gradle/BoosterPlugin.kt
@@ -4,6 +4,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.didiglobal.booster.task.spi.VariantProcessor
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -22,31 +23,31 @@ class BoosterPlugin : Plugin<Project> {
             project.gradle.addListener(BoosterTransformTaskExecutionListener(project))
         }
 
+        val processors = loadVariantProcessors(project)
+        if (project.state.executed) {
+            project.setup(processors)
+        } else {
+            project.afterEvaluate {
+                project.setup(processors)
+            }
+        }
+    }
+
+    private fun Project.setup(processors: List<VariantProcessor>) {
         val android = project.getAndroid<BaseExtension>()
         when (android) {
             is AppExtension -> android.applicationVariants
             is LibraryExtension -> android.libraryVariants
             else -> emptyList<BaseVariant>()
         }.takeIf<Collection<BaseVariant>>(Collection<BaseVariant>::isNotEmpty)?.let { variants ->
             android.registerTransform(BoosterTransform.newInstance(project))
-            if (project.state.executed) {
-                project.setup(variants)
-            } else {
-                project.afterEvaluate {
-                    project.setup(variants)
+            variants.forEach { variant ->
+                processors.forEach { processor ->
+                    processor.process(variant)
                 }
             }
         }
     }
 
-    private fun Project.setup(variants: Collection<BaseVariant>) {
-        val processors = loadVariantProcessors(this)
-        variants.forEach { variant ->
-            processors.forEach { processor ->
-                processor.process(variant)
-            }
-        }
-    }
-
 
 }