From 0f2e9176be15136d65bca9251852a13c5338cd68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Kwieci=C5=84ski?=
 <36954793+mateuszkwiecinski@users.noreply.github.com>
Date: Sat, 17 Sep 2022 09:17:36 +0200
Subject: [PATCH] Fix AGP 7.3.0  on empty sources (#417)

---
 .github/workflows/default.yml                                | 4 ++--
 .../com/project/starter/quality/plugins/QualityPlugin.kt     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
index ae203cda..95e90967 100644
--- 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
index db1b0011..83e64c9a 100644
--- 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 {