Fix Variant.localAndroidResources

didi · Jul 21, 2024 · 3a6dca1 · 3a6dca1
1 parent 6bbcfe3
commit 3a6dca1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/booster-android-gradle-api/src/main/kotlin/com/didiglobal/booster/gradle/Project.kt b/booster-android-gradle-api/src/main/kotlin/com/didiglobal/booster/gradle/Project.kt
@@ -181,7 +181,6 @@ fun Project.getJarTaskProviders(
         is ApplicationAndroidComponentsExtension -> variants.filter().mapNotNull(Variant::bundleClassesTaskProvider)
         else -> emptyList()
     }
-
     isJavaLibrary -> listOf(tasks.named(JavaPlugin.JAR_TASK_NAME))
     else -> emptyList()
 }

diff --git a/...ter-android-gradle-v8_0/src/main/kotlin/com/didiglobal/booster/android/gradle/v8_0/V80.kt b/...ter-android-gradle-v8_0/src/main/kotlin/com/didiglobal/booster/android/gradle/v8_0/V80.kt
@@ -197,10 +197,14 @@ internal object V80 : AGPInterface {
     override val Variant.localAndroidResources: FileCollection
         get() = component.services.fileCollection().from(component.sources.res?.getLocalSources()?.values?.map {
             it.map { dirs ->
-                dirs.map { dir ->
-                    dir.asFileTree
-                }.reduce { acc, dir ->
-                    acc.plus(dir)
+                if (dirs.isEmpty()) {
+                    project.files()
+                } else {
+                    dirs.map { dir ->
+                        dir.asFileTree
+                    }.reduce { acc, dir ->
+                        acc.plus(dir)
+                    }
                 }
             }
         })

diff --git a/...ter-android-gradle-v8_1/src/main/kotlin/com/didiglobal/booster/android/gradle/v8_1/V81.kt b/...ter-android-gradle-v8_1/src/main/kotlin/com/didiglobal/booster/android/gradle/v8_1/V81.kt
@@ -200,10 +200,14 @@ internal object V81 : AGPInterface {
                     !it.isUserAdded && !it.isGenerated
                 }?.values?.map {
                     it.map { dirs ->
-                        dirs.map { dir ->
-                            dir.asFileTree
-                        }.reduce { acc, dir ->
-                            acc.plus(dir)
+                        if (dirs.isEmpty()) {
+                            project.files()
+                        } else {
+                            dirs.map { dir ->
+                                dir.asFileTree
+                            }.reduce { acc, dir ->
+                                acc.plus(dir)
+                            }
                         }
                     }
                 })

diff --git a/...ter-android-gradle-v8_2/src/main/kotlin/com/didiglobal/booster/android/gradle/v8_2/V82.kt b/...ter-android-gradle-v8_2/src/main/kotlin/com/didiglobal/booster/android/gradle/v8_2/V82.kt
@@ -200,10 +200,14 @@ internal object V82 : AGPInterface {
                     !it.isUserAdded && !it.isGenerated
                 }?.values?.map {
                     it.map { dirs ->
-                        dirs.map { dir ->
-                            dir.asFileTree
-                        }.reduce { acc, dir ->
-                            acc.plus(dir)
+                        if (dirs.isEmpty()) {
+                            project.files()
+                        } else {
+                            dirs.map { dir ->
+                                dir.asFileTree
+                            }.reduce { acc, dir ->
+                                acc.plus(dir)
+                            }
                         }
                     }
                 })

diff --git a/...ter-task-graph/src/main/kotlin/com/didiglobal/booster/task/graph/GraphVariantProcessor.kt b/...ter-task-graph/src/main/kotlin/com/didiglobal/booster/task/graph/GraphVariantProcessor.kt
@@ -1,7 +1,6 @@
 package com.didiglobal.booster.task.graph
 
 import com.android.build.api.variant.Variant
-import com.didiglobal.booster.gradle.getTaskName
 import com.didiglobal.booster.gradle.project
 import com.didiglobal.booster.gradle.registerTask
 import com.didiglobal.booster.graph.Edge