Fix AGP 7.3.0 on empty sources (#417)

usefulness · Sep 17, 2022 · 0f2e917 · 0f2e917
1 parent 798f26f
commit 0f2e917
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -81,7 +81,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle: [ '7.3.3', current, release-candidate ]
+        gradle: [ '7.4', current, release-candidate ]
         task: [ build, projectTest, projectLint, projectCodeStyle, projectCoverage, issueLinksReport ]
     name: (Android) Gradle version ${{ matrix.gradle }}, task ${{ matrix.task }}
     steps:
@@ -112,7 +112,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gradle: [ '7.3', current, release-candidate ]
+        gradle: [ '7.4', current, release-candidate ]
         task: [ build, projectTest, projectCodeStyle, projectCoverage, issueLinksReport ]
     name: (Kotlin) Gradle ${{ matrix.gradle }}, task ${{ matrix.task }}
     steps:

diff --git a/quality/src/main/kotlin/com/project/starter/quality/plugins/QualityPlugin.kt b/quality/src/main/kotlin/com/project/starter/quality/plugins/QualityPlugin.kt
@@ -30,13 +30,14 @@ class QualityPlugin : Plugin<Project> {
     private fun Project.configureIssueCheckerTask() {
         registerIssueCheckerTask {
             onAndroid {
+                val emptyFileTree = project.files().asFileTree
                 sourceSets.configureEach { sourceSet ->
                     source += sourceSet.java.srcDirs
                         .map { dir -> project.fileTree(dir) }
-                        .reduce { merged: FileTree, tree: FileTree -> merged + tree }
+                        .fold(emptyFileTree) { merged: FileTree, tree: FileTree -> merged + tree }
                     source += (sourceSet.kotlin as com.android.build.gradle.api.AndroidSourceDirectorySet).srcDirs
                         .map { dir -> project.fileTree(dir) }
-                        .reduce { merged: FileTree, tree: FileTree -> merged + tree }
+                        .fold(emptyFileTree) { merged: FileTree, tree: FileTree -> merged + tree }
                 }
             }
             onMultiplatform {