diff options
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | examples/build.gradle | 26 | ||||
| -rwxr-xr-x | scripts/travis_script | 4 |
3 files changed, 13 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml index f3593393..34eeefda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,10 @@ matrix: env: TASK=BUILD_EXAMPLES_BAZEL os: linux + - jdk: oraclejdk8 + env: TASK=CHECK_EXAMPLES_FORMAT + os: linux + # Work around https://github.com/travis-ci/travis-ci/issues/2317 - env: TASK=BUILD os: osx @@ -56,6 +60,11 @@ matrix: - env: TASK=BUILD os: osx + # Allowing failures because not everyone has downloaded the google-java-format tool. + - jdk: oraclejdk8 + env: TASK=CHECK_EXAMPLES_FORMAT + os: linux + before_install: - git log --oneline --decorate --graph -30 - if \[ "$TASK" == "BUILD" \]; then diff --git a/examples/build.gradle b/examples/build.gradle index b42e8e0f..67304cf7 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -9,7 +9,6 @@ buildscript { } } dependencies { - classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.6" classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3' } } @@ -17,10 +16,6 @@ buildscript { apply plugin: 'idea' apply plugin: 'java' apply plugin: 'com.google.protobuf' -// Plugins that require java8 -if (JavaVersion.current().isJava8Compatible()) { - apply plugin: 'com.github.sherter.google-java-format' -} repositories { mavenCentral() @@ -34,27 +29,6 @@ def opencensusVersion = "0.12.2" // LATEST_OPENCENSUS_RELEASE_VERSION def grpcVersion = "1.9.0" // CURRENT_GRPC_VERSION def prometheusVersion = "0.3.0" -// Google formatter works only on java8. -if (JavaVersion.current().isJava8Compatible()) { - googleJavaFormat { - toolVersion '1.5' - } - - afterEvaluate { // Allow subproject to add more source sets. - tasks.googleJavaFormat { - // This skips proto generated files beucasue they are in gen_gradle/src/main/** - source = "src/main" - include '**/*.java' - } - - tasks.verifyGoogleJavaFormat { - // This skips proto generated files beucasue they are in gen_gradle/src/main/** - source = "src/main" - include '**/*.java' - } - } -} - tasks.withType(JavaCompile) { sourceCompatibility = '1.8' targetCompatibility = '1.8' diff --git a/scripts/travis_script b/scripts/travis_script index 68af080a..12fa7acd 100755 --- a/scripts/travis_script +++ b/scripts/travis_script @@ -58,6 +58,10 @@ case "$TASK" in curl -L -o checkstyle-8.0-all.jar https://sourceforge.net/projects/checkstyle/files/checkstyle/8.0/checkstyle-8.0-all.jar/download java -DrootDir=. -jar checkstyle-8.0-all.jar -c buildscripts/checkstyle.xml examples/src/ ;; + "CHECK_EXAMPLES_FORMAT") + curl -L -o google-java-format-1.5-all-deps.jar https://github.com/google/google-java-format/releases/download/google-java-format-1.5/google-java-format-1.5-all-deps.jar + java -jar google-java-format-1.5-all-deps.jar --set-exit-if-changed --dry-run `find examples/src/ -name '*.java'` + ;; "BUILD_EXAMPLES_GRADLE") pushd examples && ./gradlew clean assemble --stacktrace && popd ;; |