fix: manifests inputs should get from corresponding task instead of `…

…first()` selection
2BAB · Apr 18, 2021 · d4c4d36 · d4c4d36
1 parent eacd7b9
commit d4c4d36
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/...manifest/src/main/kotlin/me/xx2bab/polyfill/manifest/source/ManifestMergeInputProvider.kt b/...manifest/src/main/kotlin/me/xx2bab/polyfill/manifest/source/ManifestMergeInputProvider.kt
@@ -8,15 +8,19 @@ import org.gradle.api.Project
 import org.gradle.api.file.FileCollection
 import org.gradle.api.file.FileSystemLocation
 
-class ManifestMergeInputProvider: ApplicationSelfManageableProvider<Set<FileSystemLocation>> {
+class ManifestMergeInputProvider : ApplicationSelfManageableProvider<Set<FileSystemLocation>> {
 
     private lateinit var manifests: FileCollection
 
-    override fun initialize(project: Project,
-                            androidExtension: AndroidComponentsExtension<*, *>,
-                            variant: Variant) {
+    override fun initialize(
+        project: Project,
+        androidExtension: AndroidComponentsExtension<*, *>,
+        variant: Variant
+    ) {
         val t = project.tasks.withType(ProcessApplicationManifest::class.java)
-        manifests = t.first().getManifests()
+        manifests = t.filter {
+            it.name.contains(variant.name, true)
+        }.first().getManifests()
     }
 
     override fun get(defaultValue: Set<FileSystemLocation>?): Set<FileSystemLocation>? {