Skip to content

Commit 992054b

Browse files
authored
Merge pull request #1662 from baksha97/patch-1
Fix TODO: Collect all java and kotlin source directories from the variant's source sets
2 parents 1d67fac + f925bfc commit 992054b

File tree

1 file changed

+8
-3
lines changed
  • build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid

1 file changed

+8
-3
lines changed

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ package com.google.samples.apps.nowinandroid
1919
import com.android.build.api.artifact.ScopedArtifact
2020
import com.android.build.api.variant.AndroidComponentsExtension
2121
import com.android.build.api.variant.ScopedArtifacts
22+
import com.android.build.api.variant.SourceDirectories
2223
import org.gradle.api.Project
2324
import org.gradle.api.file.Directory
2425
import org.gradle.api.file.RegularFile
2526
import org.gradle.api.provider.ListProperty
27+
import org.gradle.api.provider.Provider
2628
import org.gradle.api.tasks.testing.Test
2729
import org.gradle.kotlin.dsl.assign
2830
import org.gradle.kotlin.dsl.configure
@@ -88,11 +90,14 @@ internal fun Project.configureJacoco(
8890
html.required = true
8991
}
9092

91-
// TODO: This is missing files in src/debug/, src/prod, src/demo, src/demoDebug...
93+
fun SourceDirectories.Flat?.toFilePaths(): Provider<List<String>> = this
94+
?.all
95+
?.map { directories -> directories.map { it.asFile.path } }
96+
?: provider { emptyList() }
9297
sourceDirectories.setFrom(
9398
files(
94-
"$projectDir/src/main/java",
95-
"$projectDir/src/main/kotlin",
99+
variant.sources.java.toFilePaths(),
100+
variant.sources.kotlin.toFilePaths()
96101
),
97102
)
98103

0 commit comments

Comments
 (0)