diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | all/build.gradle | 20 | ||||
| -rw-r--r-- | settings.gradle | 4 |
3 files changed, 21 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 15db0012..3ec9e997 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ script: ./gradlew clean assemble --stacktrace ; case "$TRAVIS_JDK_VERSION" in "oraclejdk8") - ./gradlew check :all:jacocoTestReport ;; + ./gradlew check :opencensus-all:jacocoTestReport ;; "oraclejdk7") ./gradlew check ;; esac ;; @@ -59,7 +59,7 @@ script: after_success: - if \[ "$TASK" == "BUILD" \] && \[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" \] && \[ "$TRAVIS_OS_NAME" = linux \]; then - ./gradlew :all:coveralls --stacktrace ; + ./gradlew :opencensus-all:coveralls --stacktrace ; bash <(curl -s https://codecov.io/bash) ; fi diff --git a/all/build.gradle b/all/build.gradle index 32feb263..22c02565 100644 --- a/all/build.gradle +++ b/all/build.gradle @@ -20,6 +20,21 @@ def subprojects = [ project(':core_impl_java'), project(':opencensus-impl'), project(':opencensus-impl-lite'), + project(':opencensus-testing'), + project(':opencensus-contrib-agent'), + project(':opencensus-contrib-zpages'), + project(':opencensus-exporter-trace-logging'), + project(':opencensus-exporter-trace-stackdriver'), +] + +// A subset of subprojects for which we want to publish javadoc. +def subprojects_javadoc = [ + project(':opencensus-api'), + project(':opencensus-testing'), + project(':opencensus-contrib-agent'), + project(':opencensus-contrib-zpages'), + project(':opencensus-exporter-trace-logging'), + project(':opencensus-exporter-trace-stackdriver'), ] for (subproject in rootProject.subprojects) { @@ -34,10 +49,10 @@ dependencies { } javadoc { - classpath = files(subprojects.collect { subproject -> + classpath = files(subprojects_javadoc.collect { subproject -> subproject.javadoc.classpath }) - for (subproject in subprojects) { + for (subproject in subprojects_javadoc) { if (subproject == project) { continue; } @@ -45,7 +60,6 @@ javadoc { options.links subproject.javadoc.options.links.toArray(new String[0]) } exclude 'io/opencensus/internal/**' - exclude 'io/opencensus/trace/internal/**' } task jacocoMerge(type: JacocoMerge) { diff --git a/settings.gradle b/settings.gradle index 8bfeb8d1..72524f78 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,8 +7,6 @@ include ":opencensus-impl" include ":opencensus-testing" include ":opencensus-exporter-trace-logging" include ":opencensus-exporter-trace-stackdriver" -include ":opencensus-agent" -include ":all" include ":core" include ":core_impl" include ":core_impl_java" @@ -26,9 +24,11 @@ project(':opencensus-exporter-trace-stackdriver').projectDir = "$rootDir/exporte // Java8 projects only if (JavaVersion.current().isJava8Compatible()) { + include ":opencensus-all" include ":examples" include ":benchmarks" include ":opencensus-contrib-zpages" + project(':opencensus-all').projectDir = "$rootDir/all" as File project(':opencensus-contrib-zpages').projectDir = "$rootDir/contrib/zpages" as File } |