Skip to content

Commit f0c3ea9

Browse files
committed
collapse Coverage resources tasks
1 parent df4b726 commit f0c3ea9

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

build.gradle.kts

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,39 +79,42 @@ tasks {
7979
}
8080
}
8181

82+
// add integration tests to the whole check
8283
named("check") {
83-
// add integration tests to the whole check
8484
dependsOn(intTest)
8585
}
8686

8787
val coverageResourcesDirectory = "${project.buildDir}/resources/main/CoverageHTMLReporter"
88-
val coverageResourcesZipDirectory = "${project.buildDir}/utPLSQL-coverage-html-$coverageResourcesVersion"
89-
val coverageResourcesZip = "$coverageResourcesZipDirectory.zip"
88+
val coverageResourcesZip = "${project.buildDir}/utPLSQL-coverage-html-$coverageResourcesVersion.zip"
9089

9190
// download Coverage Resources from web
9291
val downloadResources = create<Download>("downloadCoverageResources") {
9392
src("https://codeload.github.com/utPLSQL/utPLSQL-coverage-html/zip/$coverageResourcesVersion")
9493
dest(File(coverageResourcesZip))
95-
}
96-
// Extract zip-archive to build
97-
val extractCoverageResources = create<Copy>("extractCoverageResources") {
98-
dependsOn(downloadResources)
99-
from(zipTree(coverageResourcesZip))
100-
into(buildDir)
101-
}
102-
// copy assets to sources
103-
val copyCoverageResourcesToSources = create<Copy>("copyCoverageResources") {
104-
dependsOn(extractCoverageResources)
105-
from("$coverageResourcesZipDirectory/assets")
106-
into(coverageResourcesDirectory)
94+
overwrite(true)
10795
}
10896

10997
withType<ProcessResources> {
110-
dependsOn(copyCoverageResourcesToSources)
98+
dependsOn(downloadResources)
11199

112100
val properties = project.properties.toMutableMap()
113101
properties.putIfAbsent("travisBuildNumber", "local")
114102
expand(properties)
103+
104+
doLast {
105+
copy {
106+
// extract assets folder only from downloaded archive
107+
// https://github.com/gradle/gradle/pull/8494
108+
from(zipTree(coverageResourcesZip)) {
109+
include("*/assets/**")
110+
eachFile {
111+
relativePath = RelativePath(true, *relativePath.segments.drop(2).toTypedArray()) // <2>
112+
}
113+
includeEmptyDirs = false
114+
}
115+
into(coverageResourcesDirectory)
116+
}
117+
}
115118
}
116119

117120
withType<Jar> {

0 commit comments

Comments
 (0)