From ffcd7d95819ac8ac1d387f37954d0c14b8f8d491 Mon Sep 17 00:00:00 2001
From: Alfayed Baksh <baksha97@gmail.com>
Date: Mon, 16 Dec 2024 14:24:25 -0500
Subject: [PATCH] fix: code cleanup

---
 .../samples/apps/nowinandroid/Jacoco.kt       | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt
index 3d674465c..1378a5db4 100644
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt
@@ -19,11 +19,14 @@ package com.google.samples.apps.nowinandroid
 import com.android.build.api.artifact.ScopedArtifact
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.ScopedArtifacts
+import com.android.build.api.variant.SourceDirectories
 import org.gradle.api.Project
 import org.gradle.api.file.Directory
 import org.gradle.api.file.RegularFile
 import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.testing.Test
+import org.gradle.internal.impldep.io.opencensus.common.ExperimentalApi
 import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.register
@@ -89,23 +92,11 @@ internal fun Project.configureJacoco(
                 }
 
                 // Collect all java and kotlin source directories from the variant's source sets
-                val kotlin = variant
-                    .sources
-                    .kotlin
-                    ?.all
-                    ?.map { it.orEmpty() }
-                    ?.map { it.map { it.asFile.path } }
-                val java = variant
-                    .sources
-                    .java
-                    ?.all
-                    ?.map { it.orEmpty() }
-                    ?.map { it.map { it.asFile.path } }
+                fun SourceDirectories.Flat.srcs(): Provider<List<String>> = this
+                    .all
+                    .map { directories -> directories.map { it.asFile.path } }
                 sourceDirectories.setFrom(
-                    files(
-                        kotlin,
-                        java
-                    )
+                    files(variant.sources.java?.srcs(), variant.sources.kotlin?.srcs())
                 )
 
                 executionData.setFrom(