@@ -79,39 +79,42 @@ tasks {
79
79
}
80
80
}
81
81
82
+ // add integration tests to the whole check
82
83
named(" check" ) {
83
- // add integration tests to the whole check
84
84
dependsOn(intTest)
85
85
}
86
86
87
87
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"
90
89
91
90
// download Coverage Resources from web
92
91
val downloadResources = create<Download >(" downloadCoverageResources" ) {
93
92
src(" https://codeload.github.com/utPLSQL/utPLSQL-coverage-html/zip/$coverageResourcesVersion " )
94
93
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 )
107
95
}
108
96
109
97
withType<ProcessResources > {
110
- dependsOn(copyCoverageResourcesToSources )
98
+ dependsOn(downloadResources )
111
99
112
100
val properties = project.properties.toMutableMap()
113
101
properties.putIfAbsent(" travisBuildNumber" , " local" )
114
102
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
+ }
115
118
}
116
119
117
120
withType<Jar > {
0 commit comments