diff options
| author | Stefan Schmidt <stschmidt@google.com> | 2017-06-30 14:17:27 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stschmidt@google.com> | 2017-06-30 14:17:27 +0200 |
| commit | 459aaa7020867929807429440ca1358cb603752a (patch) | |
| tree | 24978024c3b046df32d6106dec877736d93ccf35 | |
| parent | c433da68f1fba73c896903a9b9d445a95fedb6b5 (diff) | |
| download | platform_external_opencensus-java-459aaa7020867929807429440ca1358cb603752a.tar.gz platform_external_opencensus-java-459aaa7020867929807429440ca1358cb603752a.tar.bz2 platform_external_opencensus-java-459aaa7020867929807429440ca1358cb603752a.zip | |
Get the Java 8 home from jdk_switcher instead of hardcoding the path.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | contrib/agent/build.gradle | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index d7ae79ca..fcab102a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,7 @@ script: "CHECK_GIT_HISTORY") python check-git-history.py ;; "BUILD") + export JAVA8_HOME=`jdk_switcher home oraclejdk8` ; ./gradlew clean assemble --stacktrace ; case "$TRAVIS_JDK_VERSION" in "oraclejdk8") diff --git a/contrib/agent/build.gradle b/contrib/agent/build.gradle index f4147ca4..79adfadb 100644 --- a/contrib/agent/build.gradle +++ b/contrib/agent/build.gradle @@ -12,7 +12,6 @@ targetCompatibility = JavaVersion.VERSION_1_7 // used to check for unexpected references to later APIs. Also see dependencies/signature. retrolambda { javaVersion JavaVersion.VERSION_1_6 - jdk '/usr/lib/jvm/java-8-oracle' } def agentPackage = 'io.opencensus.contrib.agent' |