Skip to content
This repository was archived by the owner on Dec 23, 2023. It is now read-only.

Commit 8af5347

Browse files
author
Bogdan Drutu
authored
Update all project to calculate coverage for all projects and generate javadocs only for public APIs. (#578)
1 parent 0890ab4 commit 8af5347

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ script:
4848
./gradlew clean assemble --stacktrace ;
4949
case "$TRAVIS_JDK_VERSION" in
5050
"oraclejdk8")
51-
./gradlew check :all:jacocoTestReport ;;
51+
./gradlew check :opencensus-all:jacocoTestReport ;;
5252
"oraclejdk7")
5353
./gradlew check ;;
5454
esac ;;
@@ -59,7 +59,7 @@ script:
5959

6060
after_success:
6161
- if \[ "$TASK" == "BUILD" \] && \[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" \] && \[ "$TRAVIS_OS_NAME" = linux \]; then
62-
./gradlew :all:coveralls --stacktrace ;
62+
./gradlew :opencensus-all:coveralls --stacktrace ;
6363
bash <(curl -s https://codecov.io/bash) ;
6464
fi
6565

all/build.gradle

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,21 @@ def subprojects = [
2020
project(':core_impl_java'),
2121
project(':opencensus-impl'),
2222
project(':opencensus-impl-lite'),
23+
project(':opencensus-testing'),
24+
project(':opencensus-contrib-agent'),
25+
project(':opencensus-contrib-zpages'),
26+
project(':opencensus-exporter-trace-logging'),
27+
project(':opencensus-exporter-trace-stackdriver'),
28+
]
29+
30+
// A subset of subprojects for which we want to publish javadoc.
31+
def subprojects_javadoc = [
32+
project(':opencensus-api'),
33+
project(':opencensus-testing'),
34+
project(':opencensus-contrib-agent'),
35+
project(':opencensus-contrib-zpages'),
36+
project(':opencensus-exporter-trace-logging'),
37+
project(':opencensus-exporter-trace-stackdriver'),
2338
]
2439

2540
for (subproject in rootProject.subprojects) {
@@ -34,18 +49,17 @@ dependencies {
3449
}
3550

3651
javadoc {
37-
classpath = files(subprojects.collect { subproject ->
52+
classpath = files(subprojects_javadoc.collect { subproject ->
3853
subproject.javadoc.classpath
3954
})
40-
for (subproject in subprojects) {
55+
for (subproject in subprojects_javadoc) {
4156
if (subproject == project) {
4257
continue;
4358
}
4459
source subproject.javadoc.source
4560
options.links subproject.javadoc.options.links.toArray(new String[0])
4661
}
4762
exclude 'io/opencensus/internal/**'
48-
exclude 'io/opencensus/trace/internal/**'
4963
}
5064

5165
task jacocoMerge(type: JacocoMerge) {

settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ include ":opencensus-impl"
77
include ":opencensus-testing"
88
include ":opencensus-exporter-trace-logging"
99
include ":opencensus-exporter-trace-stackdriver"
10-
include ":opencensus-agent"
11-
include ":all"
1210
include ":core"
1311
include ":core_impl"
1412
include ":core_impl_java"
@@ -26,9 +24,11 @@ project(':opencensus-exporter-trace-stackdriver').projectDir = "$rootDir/exporte
2624

2725
// Java8 projects only
2826
if (JavaVersion.current().isJava8Compatible()) {
27+
include ":opencensus-all"
2928
include ":examples"
3029
include ":benchmarks"
3130
include ":opencensus-contrib-zpages"
3231

32+
project(':opencensus-all').projectDir = "$rootDir/all" as File
3333
project(':opencensus-contrib-zpages').projectDir = "$rootDir/contrib/zpages" as File
3434
}

0 commit comments

Comments
 (0)