@@ -19,11 +19,14 @@ package com.google.samples.apps.nowinandroid
1919import com.android.build.api.artifact.ScopedArtifact
2020import com.android.build.api.variant.AndroidComponentsExtension
2121import com.android.build.api.variant.ScopedArtifacts
22+ import com.android.build.api.variant.SourceDirectories
2223import org.gradle.api.Project
2324import org.gradle.api.file.Directory
2425import org.gradle.api.file.RegularFile
2526import org.gradle.api.provider.ListProperty
27+ import org.gradle.api.provider.Provider
2628import org.gradle.api.tasks.testing.Test
29+ import org.gradle.internal.impldep.io.opencensus.common.ExperimentalApi
2730import org.gradle.kotlin.dsl.assign
2831import org.gradle.kotlin.dsl.configure
2932import org.gradle.kotlin.dsl.register
@@ -89,23 +92,11 @@ internal fun Project.configureJacoco(
8992 }
9093
9194 // Collect all java and kotlin source directories from the variant's source sets
92- val kotlin = variant
93- .sources
94- .kotlin
95- ?.all
96- ?.map { it.orEmpty() }
97- ?.map { it.map { it.asFile.path } }
98- val java = variant
99- .sources
100- .java
101- ?.all
102- ?.map { it.orEmpty() }
103- ?.map { it.map { it.asFile.path } }
95+ fun SourceDirectories.Flat.srcs (): Provider <List <String >> = this
96+ .all
97+ .map { directories -> directories.map { it.asFile.path } }
10498 sourceDirectories.setFrom(
105- files(
106- kotlin,
107- java
108- )
99+ files(variant.sources.java?.srcs(), variant.sources.kotlin?.srcs())
109100 )
110101
111102 executionData.setFrom(
0 commit comments