Fix spotless.

Change-Id: Ib610c17b717305f186982679ddd35be74cf3791f
pull/1837/head
Jaehwa Noh 1 year ago
parent 6db82dc5dc
commit 1433264c73

@ -67,9 +67,13 @@ internal fun Project.configureJacoco(
val myObjFactory = project.objects val myObjFactory = project.objects
val buildDir = layout.buildDirectory.get().asFile val buildDir = layout.buildDirectory.get().asFile
val allJars: ListProperty<RegularFile> = myObjFactory.listProperty(RegularFile::class.java) val allJars: ListProperty<RegularFile> = myObjFactory.listProperty(RegularFile::class.java)
val allDirectories: ListProperty<Directory> = myObjFactory.listProperty(Directory::class.java) val allDirectories: ListProperty<Directory> =
myObjFactory.listProperty(Directory::class.java)
val reportTask = val reportTask =
tasks.register("create${variant.name.capitalize()}CombinedCoverageReport", JacocoReport::class) { tasks.register(
"create${variant.name.capitalize()}CombinedCoverageReport",
JacocoReport::class,
) {
classDirectories.setFrom( classDirectories.setFrom(
allJars, allJars,
@ -77,7 +81,7 @@ internal fun Project.configureJacoco(
dirs.map { dir -> dirs.map { dir ->
myObjFactory.fileTree().setDir(dir).exclude(coverageExclusions) myObjFactory.fileTree().setDir(dir).exclude(coverageExclusions)
} }
} },
) )
reports { reports {
xml.required = true xml.required = true
@ -85,14 +89,19 @@ internal fun Project.configureJacoco(
} }
// TODO: This is missing files in src/debug/, src/prod, src/demo, src/demoDebug... // TODO: This is missing files in src/debug/, src/prod, src/demo, src/demoDebug...
sourceDirectories.setFrom(files("$projectDir/src/main/java", "$projectDir/src/main/kotlin")) sourceDirectories.setFrom(
files(
"$projectDir/src/main/java",
"$projectDir/src/main/kotlin",
),
)
executionData.setFrom( executionData.setFrom(
project.fileTree("$buildDir/outputs/unit_test_code_coverage/${variant.name}UnitTest") project.fileTree("$buildDir/outputs/unit_test_code_coverage/${variant.name}UnitTest")
.matching { include("**/*.exec") }, .matching { include("**/*.exec") },
project.fileTree("$buildDir/outputs/code_coverage/${variant.name}AndroidTest") project.fileTree("$buildDir/outputs/code_coverage/${variant.name}AndroidTest")
.matching { include("**/*.ec") } .matching { include("**/*.ec") },
) )
} }

@ -54,7 +54,7 @@ internal fun Project.configurePrintApksTask(extension: AndroidComponentsExtensio
if (artifact != null && testSources != null) { if (artifact != null && testSources != null) {
tasks.register( tasks.register(
"${variant.name}PrintTestApk", "${variant.name}PrintTestApk",
PrintApkLocationTask::class.java PrintApkLocationTask::class.java,
) { ) {
apkFolder = artifact apkFolder = artifact
builtArtifactsLoader = loader builtArtifactsLoader = loader

Loading…
Cancel
Save