Remove format and licence tasks for tests and move to gradle. (#1691)

Author: Bogdan Drutu

.travis.yml

@@ -25,10 +25,6 @@ matrix:
     os: linux
 
   # Build example projects last, since they are affected by fewer pull requests.
-  - jdk: oraclejdk8
-    env: TASK=CHECK_EXAMPLES_LICENSE
-    os: linux
-
   - jdk: oraclejdk8
     env: TASK=BUILD_EXAMPLES_GRADLE
     os: linux
@@ -41,10 +37,6 @@ 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
     # Set the java version to 1.8 until we fix the build for java10.

buildscripts/kokoro/linux_example_format.cfg

@@ -22,8 +22,6 @@ valid_tasks() {
   echo "- BUILD_EXAMPLES_GRADLE"
   echo "- BUILD_EXAMPLES_MAVEN"
   echo "- CHECKER_FRAMEWORK"
-  echo "- CHECK_EXAMPLES_FORMAT"
-  echo "- CHECK_EXAMPLES_LICENSE"
   echo "- CHECK_GIT_HISTORY"
 }
 
@@ -63,17 +61,8 @@ case "$TASK" in
   "CHECKER_FRAMEWORK")
     ./gradlew clean assemble -PcheckerFramework=true
     ;;
-  "CHECK_EXAMPLES_LICENSE")
-    curl -L -o checkstyle-8.12-all.jar https://github.com/checkstyle/checkstyle/releases/download/checkstyle-8.12/checkstyle-8.12-all.jar
-    java -DrootDir=. -jar checkstyle-8.12-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
+    pushd examples && ./gradlew clean assemble --stacktrace && ./gradlew check && ./gradlew verGJF && popd
     ;;
   "BUILD_EXAMPLES_MAVEN")
     pushd examples && mvn clean package appassembler:assemble -e && popd

buildscripts/kokoro/linux_example_license.cfg

@@ -63,7 +63,7 @@ case "$TASK" in
     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
+    pushd examples && ./gradlew clean assemble --stacktrace && ./gradlew check && ./gradlew verGJF && popd
     ;;
   "BUILD_EXAMPLES_MAVEN")
     pushd examples && mvn clean package appassembler:assemble -e && popd

buildscripts/kokoro/linux_presubmit.sh

@@ -11,12 +11,15 @@ buildscript {
     dependencies {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
+        classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.8"
     }
 }
 
+apply plugin: "checkstyle"
+apply plugin: 'com.google.protobuf'
+apply plugin: 'com.github.sherter.google-java-format'
 apply plugin: 'idea'
 apply plugin: 'java'
-apply plugin: 'com.google.protobuf'
 
 // Display the version report using: ./gradlew dependencyUpdates
 // Also see https://github.com/ben-manes/gradle-versions-plugin.
@@ -69,6 +72,17 @@ dependencies {
             "io.netty:netty-tcnative-boringssl-static:2.0.8.Final"
 }
 
+googleJavaFormat {
+    toolVersion '1.7'
+    source = 'src/main'
+    include '**/*.java'
+}
+
+verifyGoogleJavaFormat {
+    source = 'src/main'
+    include '**/*.java'
+}
+
 protobuf {
     protoc {
         artifact = 'com.google.protobuf:protoc:3.6.1'
@@ -99,6 +113,17 @@ sourceSets {
     }
 }
 
+checkstyle {
+    configFile = file("$rootDir/../buildscripts/checkstyle.xml")
+    toolVersion = "8.12"
+    ignoreFailures = false
+    configProperties["rootDir"] = "$rootDir/.."
+}
+
+// Disable checkstyle if no java8.
+checkstyleMain.source = 'src/main'
+checkstyleTest.source = 'src/main'
+
 // Provide convenience executables for trying out the examples.
 apply plugin: 'application'