Skip to content

Commit ffcd7d9

Browse files
committed
fix: code cleanup
1 parent 27f548f commit ffcd7d9

File tree

1 file changed

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

1 file changed

+7
-16
lines changed

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ 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
29+
import org.gradle.internal.impldep.io.opencensus.common.ExperimentalApi
2730
import org.gradle.kotlin.dsl.assign
2831
import org.gradle.kotlin.dsl.configure
2932
import 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

Comments
 (0)