Skip to content

Commit 9bd7bab

Browse files
committed
Produce cleaner JavaDoc and Jacoco output
Instead of producing output for all projects, just do it for projects that matter to our users.
1 parent 4b4f76d commit 9bd7bab

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

all/build.gradle

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ description = "gRPC: All"
33
// Make sure that no transitive dependencies are included.
44
configurations.compile.transitive = false
55

6+
def subprojects = [
7+
project(':grpc-auth'),
8+
project(':grpc-core'),
9+
project(':grpc-netty'),
10+
project(':grpc-okhttp'),
11+
project(':grpc-protobuf'),
12+
project(':grpc-protobuf-nano'),
13+
project(':grpc-stub'),
14+
]
15+
616
for (subproject in rootProject.subprojects) {
717
if (subproject == project) {
818
continue
@@ -11,13 +21,7 @@ for (subproject in rootProject.subprojects) {
1121
}
1222

1323
dependencies {
14-
compile project(':grpc-auth'),
15-
project(':grpc-core'),
16-
project(':grpc-netty'),
17-
project(':grpc-okhttp'),
18-
project(':grpc-protobuf'),
19-
project(':grpc-protobuf-nano'),
20-
project(':grpc-stub')
24+
compile subprojects
2125
}
2226

2327
// Create a fat jar containing only the direct dependencies
@@ -30,10 +34,10 @@ jar {
3034
}
3135

3236
javadoc {
33-
classpath = files(rootProject.subprojects.collect { subproject ->
37+
classpath = files(subprojects.collect { subproject ->
3438
subproject.javadoc.classpath
3539
})
36-
for (subproject in rootProject.subprojects) {
40+
for (subproject in subprojects) {
3741
if (subproject == project) {
3842
continue;
3943
}
@@ -44,15 +48,15 @@ javadoc {
4448

4549
task jacocoMerge(type: JacocoMerge) {
4650
destinationFile = file("${buildDir}/jacoco/test.exec")
47-
executionData = files(rootProject.subprojects.jacocoTestReport.executionData)
48-
.minus(files("${buildDir}/jacoco/test.exec"))
51+
executionData = files(subprojects.jacocoTestReport.executionData)
52+
.plus(project(':grpc-interop-testing').jacocoTestReport.executionData)
4953
.filter { f -> f.exists() }
5054
}
5155

5256
jacocoTestReport {
5357
dependsOn(jacocoMerge)
5458

55-
additionalSourceDirs = files(rootProject.subprojects.sourceSets.main.allSource.srcDirs)
56-
sourceDirectories = files(rootProject.subprojects.sourceSets.main.allSource.srcDirs)
57-
classDirectories = files(rootProject.subprojects.sourceSets.main.output)
59+
additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs)
60+
sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs)
61+
classDirectories = files(subprojects.sourceSets.main.output)
5862
}

0 commit comments

Comments
 (0)