diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | all/build.gradle | 13 | ||||
| -rw-r--r-- | benchmarks/build.gradle | 6 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | core/build.gradle | 4 | ||||
| -rw-r--r-- | core_impl/build.gradle | 4 | ||||
| -rw-r--r-- | core_impl_android/build.gradle | 4 | ||||
| -rw-r--r-- | core_impl_java/build.gradle | 4 | ||||
| -rw-r--r-- | examples/build.gradle | 6 | ||||
| -rw-r--r-- | settings.gradle | 28 |
10 files changed, 39 insertions, 38 deletions
diff --git a/.travis.yml b/.travis.yml index 864e8135..d7ae79ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ script: ./gradlew clean assemble --stacktrace ; case "$TRAVIS_JDK_VERSION" in "oraclejdk8") - ./gradlew check :instrumentation-java-all:jacocoTestReport ;; + ./gradlew check :all:jacocoTestReport ;; "oraclejdk7") ./gradlew check ;; esac ;; @@ -51,7 +51,7 @@ script: after_success: - if \[ "$TASK" == "BUILD" \] && \[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" \] && \[ "$TRAVIS_OS_NAME" = linux \]; then - ./gradlew :instrumentation-java-all:coveralls --stacktrace ; + ./gradlew :all:coveralls --stacktrace ; bash <(curl -s https://codecov.io/bash) ; fi diff --git a/all/build.gradle b/all/build.gradle index 143e4cb3..550b924c 100644 --- a/all/build.gradle +++ b/all/build.gradle @@ -11,15 +11,12 @@ buildscript { } } -// TODO(sebright): Look into handling instrumentation-java-core-impl-java-7, -// instrumentation-java-core-impl-java-8, and -// instrumentation-java-core-impl-android. 'subprojects' currently doesn't -// include all directories, because Javadoc cannot handle multiple classes with -// the same name, such as StatsManagerImpl. +// TODO(bdrutu): core_impl_android subproject currently isn't included because Javadoc cannot +// handle multiple classes with the same name, such as StatsManagerImpl. def subprojects = [ - project(':instrumentation-java-core'), - project(':instrumentation-java-core-impl'), - project(':instrumentation-java-core-impl-java'), + project(':core'), + project(':core_impl'), + project(':core_impl_java'), ] for (subproject in rootProject.subprojects) { diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index b001f268..8b58bbf5 100644 --- a/benchmarks/build.gradle +++ b/benchmarks/build.gradle @@ -23,9 +23,9 @@ jmh { } dependencies { - compile project(':instrumentation-java-core'), - project(':instrumentation-java-core-impl') - project(':instrumentation-java-core-impl-java') + compile project(':core'), + project(':core_impl') + project(':core_impl_java') } compileJmhJava { diff --git a/build.gradle b/build.gradle index c423917f..c1ea9c32 100644 --- a/build.gradle +++ b/build.gradle @@ -215,7 +215,7 @@ subprojects { packaging 'jar' // Add a map with all the project.name -> artifactId when we // are going to upload more artifacts. - artifactId 'instrumentation-api' + artifactId jar.baseName description project.description url 'https://github.com/google/instrumentation-java' @@ -247,7 +247,7 @@ subprojects { } } // For the moment we upload only the artifact for the API - uploadArchives.onlyIf { name == 'instrumentation-java-core'} + uploadArchives.onlyIf { name == 'core'} // At a test failure, log the stack trace to the console so that we don't // have to open the HTML in a browser. diff --git a/core/build.gradle b/core/build.gradle index c7516a67..ec1b7c59 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,5 +1,9 @@ description = 'Instrumentation: API' +jar { + baseName = 'instrumentation-api' +} + dependencies { compile libraries.grpc_context, libraries.guava diff --git a/core_impl/build.gradle b/core_impl/build.gradle index d0f5564b..5040d69c 100644 --- a/core_impl/build.gradle +++ b/core_impl/build.gradle @@ -1,14 +1,14 @@ description = 'Instrumentation Core Impl' dependencies { - compile project(':instrumentation-java-core'), + compile project(':core'), project(':shared'), libraries.auto_value, libraries.guava compileOnly libraries.auto_value - testCompile project(':instrumentation-java-core') + testCompile project(':core') signature "org.codehaus.mojo.signature:java16:+@signature" } diff --git a/core_impl_android/build.gradle b/core_impl_android/build.gradle index fc205157..17249dac 100644 --- a/core_impl_android/build.gradle +++ b/core_impl_android/build.gradle @@ -1,8 +1,8 @@ description = 'Instrumentation Core Impl Android' dependencies { - compile project(':instrumentation-java-core'), - project(':instrumentation-java-core-impl') + compile project(':core'), + project(':core_impl') signature "net.sf.androidscents.signature:android-api-level-14:+@signature" } diff --git a/core_impl_java/build.gradle b/core_impl_java/build.gradle index 149fae40..a223ac63 100644 --- a/core_impl_java/build.gradle +++ b/core_impl_java/build.gradle @@ -8,8 +8,8 @@ apply plugin: 'java' } dependencies { - compile project(':instrumentation-java-core'), - project(':instrumentation-java-core-impl'), + compile project(':core'), + project(':core_impl'), libraries.disruptor signature "org.codehaus.mojo.signature:java17:+@signature" diff --git a/examples/build.gradle b/examples/build.gradle index e69c088e..30b305e9 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -6,9 +6,9 @@ tasks.withType(JavaCompile) { } dependencies { - compile project(':instrumentation-java-core'), - project(':instrumentation-java-core-impl'), - project(':instrumentation-java-core-impl-java'), + compile project(':core'), + project(':core_impl'), + project(':core_impl_java'), libraries.grpc_context } diff --git a/settings.gradle b/settings.gradle index d06d25bb..5b0bb480 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,23 +1,23 @@ rootProject.name = "instrumentation-java" -include ":instrumentation-java-all" -include ":instrumentation-java-core" -include ":instrumentation-java-core-impl" -include ":instrumentation-java-core-impl-java" -include ":instrumentation-java-core-impl-android" +include ":all" +include ":core" +include ":core_impl" +include ":core_impl_java" +include ":core_impl_android" include ":shared" -project(':instrumentation-java-all').projectDir = "$rootDir/all" as File -project(':instrumentation-java-core').projectDir = "$rootDir/core" as File -project(':instrumentation-java-core-impl').projectDir = "$rootDir/core_impl" as File -project(':instrumentation-java-core-impl-java').projectDir = "$rootDir/core_impl_java" as File -project(':instrumentation-java-core-impl-android').projectDir = "$rootDir/core_impl_android" as File +project(':all').projectDir = "$rootDir/all" as File +project(':core').projectDir = "$rootDir/core" as File +project(':core_impl').projectDir = "$rootDir/core_impl" as File +project(':core_impl_java').projectDir = "$rootDir/core_impl_java" as File +project(':core_impl_android').projectDir = "$rootDir/core_impl_android" as File project(':shared').projectDir = "$rootDir/shared" as File // Java8 projects only if (JavaVersion.current().isJava8Compatible()) { - include ":instrumentation-examples" - include ":instrumentation-java-benchmarks" + include ":examples" + include ":benchmarks" - project(':instrumentation-examples').projectDir = "$rootDir/examples" as File - project(':instrumentation-java-benchmarks').projectDir = "$rootDir/benchmarks" as File + project(':examples').projectDir = "$rootDir/examples" as File + project(':benchmarks').projectDir = "$rootDir/benchmarks" as File } |