diff options
| -rw-r--r-- | examples/README.md | 4 | ||||
| -rw-r--r-- | examples/build.gradle | 28 | ||||
| -rwxr-xr-x | scripts/travis_script | 5 |
3 files changed, 3 insertions, 34 deletions
diff --git a/examples/README.md b/examples/README.md index 4144c872..c9e67b9f 100644 --- a/examples/README.md +++ b/examples/README.md @@ -9,12 +9,12 @@ $ ./gradlew installDist ## To run "StatsRunner" example use ``` -$ ./examples/build/install/examples/bin/StatsRunner +$ ./build/install/examples/bin/StatsRunner ``` ## To run "ZPagesTester" ``` -$ ./examples/build/install/examples/bin/ZPagesTester +$ ./build/install/examples/bin/ZPagesTester ``` Available pages: diff --git a/examples/build.gradle b/examples/build.gradle index b1820b66..b9bf232d 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -1,25 +1,8 @@ description = 'OpenCensus Examples' -buildscript { - repositories { - mavenCentral() - mavenLocal() - maven { - url "https://plugins.gradle.org/m2/" - } - } - dependencies { - classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.6" - } -} - apply plugin: "checkstyle" apply plugin: 'idea' apply plugin: 'java' -// Plugins that require java8 -if (JavaVersion.current().isJava8Compatible()) { - apply plugin: 'com.github.sherter.google-java-format' -} repositories { mavenCentral() @@ -41,17 +24,6 @@ checkstyle { configProperties["rootDir"] = file("$rootDir/../") } -// Disable checkstyle if no java8. -checkstyleMain.enabled = JavaVersion.current().isJava8Compatible() -checkstyleTest.enabled = JavaVersion.current().isJava8Compatible() - -// Google formatter works only on java8. -if (JavaVersion.current().isJava8Compatible()) { - googleJavaFormat { - toolVersion '1.5' - } -} - tasks.withType(JavaCompile) { sourceCompatibility = '1.8' targetCompatibility = '1.8' diff --git a/scripts/travis_script b/scripts/travis_script index ff3d7c9a..eab22bb8 100755 --- a/scripts/travis_script +++ b/scripts/travis_script @@ -42,10 +42,7 @@ case "$TASK" in # https://docs.travis-ci.com/user/reference/osx/#JDK-and-OS-X ./gradlew clean assemble --stacktrace ./gradlew check - java_version=`java -version 2>&1 | awk -F '"' '/version/ {print $2}'` - if [[ ! "$java_version" < "1.8" ]]; then - pushd examples && ./gradlew clean assemble check --stacktrace && popd - fi + pushd examples && ./gradlew clean assemble check --stacktrace && popd ;; *) echo "Unknown OS name $TRAVIS_OS_NAME" |